Re: git difftool is not working as expected during MERGING

On Wed, Jun 10, 2015 at 03:12:21PM +0200, Bossert, Andre wrote: 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

git difftool is not working as expected during MERGING

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