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

Unifying mergetool configuration between git and git-gui

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Jul 22, 2012, 14:22 UTC
Message-ID
<500C0C9F.1000709@gmail.com>
Hi,

I was about to add a configuration for yet another mergetool when I realized that git gui's mergetool.tcl pretty much duplicates git's mergetools/* configuration files. Can some one tell me why this is necessary? I would have expected git gui to simply rely on "git mergetool" to launch the mergetool. Or, in case that git gui needs to use a different tool than the one configured as mergetool, that mergetool.tcl somehow uses the configuration from mergetools/*.

Thanks for any insights.
-- 
Sebastian Schuberth
Next: David Aguilar
Message 1 of 2 in “Unifying mergetool configuration between git and git-gui”
  1. Sebastian SchuberthJul 22, 2012
  2. David AguilarJul 23, 2012

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.