whiteinge/dotfiles — pull request #6 by hammacher (2012-10-27 12:38:48+00:00)
Title: Minor improvement in diffconflicts script

Hey,

I just found your post about the diffconflicts script (http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool), and immediately tried it out. Works like a charm! Thanks a lot for this script!

I just made a few minor changes, the most important being the last one: I find it helpful to add the "names" of the two versions to the filenames, in order to recognise which file is shown in which window.
I extract them just from the first diff marker (in this case HEAD and origin/master):
<<<<<<< HEAD
foo
=======
bar
>>>>>>> origin/master

If you like this change, please pull it. I would delete my fork then.

Thanks,
Clemens