Add a VCSConflictDiff command to help resolving conflicts

[GoogleCodeExporter]

I'd like to see a VCSConflictDiff command which would basically be similar to 
the VCSVimDiff command but instead of comparing 2 revisions of the file 
side-by-side vertically, it would compare 2 'sides' of a conflict within the 
current buffer, with the current buffer has conflict markers. To make this a 
bit clearer, i'm attaching 2 files. One that consists a conflict and second a 
completely naive implementation of how the file will be processed to create the 
2 buffers to compare side by side.

I'm sorry I don't have enough vimscript foo to submit a patch but hopefully my 
script serves as a proof of concept.

The closest I've seen a vimscript come to this idea is:

http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool

However, I'd love to see something like this incorporated in VCSCommand.

Feel free to ask me for clarifications etc.

cheers,
- steve

Original issue reported on code.google.com by lonetwin@gmail.com on 2 Jun 2014 at 4:32

Attachments:

• conflicting.txt
• show_conflicts.vim