Erik Cervin Edin <erik@xxxxxxxxxxx> writes: > In the situations of more complicated conflicts (as well as the > functionality you request) can be invoked using > git mergetool > git mergetool -- 'pathspec' > git mergetool --tool=vimdiff -- 'pathspec' Yeah, I forgot all about "git mergetool". I think that is the official answer to the original question.
