Jacob Helwig <jacob.helwig <at> gmail.com> writes: > That actually looks exactly like it should. The order of the windows > that vimdiff uses is (IIRC): ours, on-disk file, theirs. Hm, you’re right. I just found the git-mergetool--lib script on my system and it opens vimdiff with $LOCAL $MERGED $REMOTE. Thank you, that opened my eyes enough to clarify my question: The conflict markers don't seem very useful in the context of a merge tool. I would prefer to see two windows in vimdiff with each side of the conflict, respectively. Something like: vimdiff $MERGED-left-hand-conflicts $MERGED-right-hand-conflicts Is that possible with Git -- or does anyone know of external tools to help with such a workflow? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html