From: Jakub Turski <yacoob@gmail.com>
Date: Sun, 27 Nov 2011 18:09:14 GMT
Subject: [BUG] difftool falls back to normal diff when used during merge resolution
Message-ID: <CAHWJSOSB768hWsNqrR559wef3-k_yZ=TjS_mxfj3TxXdgwm5iQ@mail.gmail.com>

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.