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

git mergetool ignores configured command line

From
AVAlexander Vladimirov <alexander.idkfa.vladimirov@gmail.com>
Date
Oct 23, 2011, 04:43 UTC
Message-ID
<CAARCrw6D7CKy2Jn43zUZ3EefyqdY6Tk4A39ZQ74H6hySA5eCBQ@mail.gmail.com>

To configure diffuse as merge tool I set mergetool configuration using following commands:

git config --global merge.tool diffuse git config --global mergetool.diffuse.cmd '/usr/bin/diffuse "$LOCAL" "$MERGED" "$REMOTE"'

Then, when I invoke mergetool during merge, I get diffuse with four panes open as by default, instead of three specified in command line setting. Is this an expected behavior, and how can I force mergetool to use provided command line?

Next: Andreas Schwab
Message 1 of 4 in “git mergetool ignores configured command line”
  1. Alexander VladimirovOct 23, 2011
  2. Andreas SchwabOct 23, 2011
  3. Junio C HamanoOct 23, 2011
  4. David AguilarOct 23, 2011

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.