git/list[1] front-page[2] threads[3] people[4] search[5] about
 

"git difftool" is not working as expected during MERGING

From
BABossert, Andre <anb0s@anbos.de>
Date
Jun 10, 2015, 13:12 UTC
Message-ID
<CALzBCsGSJJZhWRoSVW6-tb+grxnFTOWSQ8kQFmwk05sC-30Q6w@mail.gmail.com>
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
Next: David Aguilar
Message 1 of 2 in “"git difftool" is not working as expected during MERGING”
  1. Bossert, AndreJun 10, 2015
  2. David AguilarJun 11, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.