Add examples for diff conflicting files

[albfan]

Diffting conflict files is as easy as doing:

$ cdiff :1:file :2:file
$ cdiff :1:file :3:file

Where:

• 1: is base
• 2: is ours
• 3: is theirs

Things get complicated easily when using rebase command, where our changes become theirs and viceversa

Will it be helpful to add options like

$ cdiff --conflict-12 file
$ cdiff --conflict-13 file
$ cdiff --conflict-23 file

?

Maybe a --reverse option can be added to offer --conflict-21, etc. Or --rebase-12 that implies --conflict-12 --reverse etc