I'm a little surprised whenever I see people doing nontrivial conflict resolution without having conflictstyle = diff3 so you can see the common ancestors of the divergent code blocks. I take it you don't use this. I suggest you do! And along those lines, it'd be great if you could tweak this plugin to handle that format, which looks like:
<<<<<<< HEAD
some code changed one way
||||||| merged common ancestors
some code
=======
some code changed another way
>>>>>>> master
I'm a little surprised whenever I see people doing nontrivial conflict resolution without having
conflictstyle = diff3
so you can see the common ancestors of the divergent code blocks. I take it you don't use this. I suggest you do! And along those lines, it'd be great if you could tweak this plugin to handle that format, which looks like: