Hello there, Just found this behavior, and after a chat on IRC it looks to me like an actual bug. I have 'git difftool' configured to use vimdiff - and it worked fine. Despite that config, git still falls back to plain diff when I launch difftool mid-way through merge conflict resolution. Here's a reproducable testcase (w/ version 1.7.7.3) $ mkdir a; cd a; git init; echo A>A; git add A; git commit -m A; git branch alt; echo AA>A; git commit -am AA; git checkout alt; echo B>A; git commit -m B; git commit -am B; git checkout master; git merge alt; git difftool -t vimdiff A Results: http://pastie.org/2929336 KT. -- 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