From: Bossert, Andre Date: Wed, 10 Jun 2015 13:12:21 GMT Subject: "git difftool" is not working as expected during MERGING Message-ID: Hello, i've tested "git difftool" with -t --ext-cmd and other options to see my diff with external tools, but it always show internal text-diff in console. The same tests with "git mergetool" working as expected. I've compared (nanually reviewed) git-mergetool.sh with git-difftool.pl and see that difftool is mixed / shared implementation with normal "git diff" command. So during MERGING state there is no possibility to call external difftool with this command. Any ideas why this was implemented this way? -- Regards Andre (anb0s) eMail: anb0s@anbos.de