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

Re: git-mergetool: wrap tools with 3 files only to use the BASE file instead of MERGED

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Aug 11, 2011, 08:49 UTC
Message-ID
<20110811084955.GA31233@elie.gateway.2wire.net>
In-Reply-To
<20110811083835.GA29507@gmail.com>
David Aguilar wrote:
> I think it sounds like a good thing for certain tools.
> Sebastian mentioned it being fine in ecmerge and bc3.
> xxdiff also lets you specify the output file, so it
> probably wouldn't need it either, I think.

At the risk of taking away the itch for a good feature: meld joined the crowd of tools with -o to specify an output file in v1.5.0.

 http://thread.gmane.org/gmane.comp.gnome.meld.general/1270
Previous: David AguilarNext: David Aguilar
Message 5 of 7 in “Re: git-mergetool: wrap tools with 3 files only to use the BASE file instead of MERGED”
  1. Jonathan NiederAug 10, 2011
  2. Tanguy OrtoloAug 10, 2011
  3. Sebastian SchuberthAug 10, 2011
  4. David AguilarAug 11, 2011
  5. Jonathan NiederAug 11, 2011
  6. David AguilarAug 11, 2011
  7. Sebastian SchuberthAug 11, 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.