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

Re: [PATCH] merge-recursive: configurable 'merge' program

From
Jakub Narebski <jnareb@gmail.com>
Date
Dec 5, 2006, 00:01 UTC
Message-ID
<el2cpj$cna$1@sea.gmane.org>
In-Reply-To
<20061204235647.9BA8B139B0E@magnus.utsl.gen.nz>
Sam Vilain wrote:
> For those who like to spawn interactive merge tools on a merge failure
> or otherwise run some kind of script, allow a "merge.tool" repo-config
> option that will take arguments as merge(1) does.

How it goes together with merge-recursive rewrite using built-in merge tool from xdiff, xdl_merge?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Sam VilainNext: Johannes Schindelin
Message 2 of 8 in “merge-recursive: configurable 'merge' program”
  1. merge-recursive: configurable 'merge' programSam Vilain, Dec 4, 2006
  2. Jakub NarebskiDec 5, 2006
  3. Johannes SchindelinDec 5, 2006
  4. Jakub NarebskiDec 5, 2006
  5. Johannes SchindelinDec 5, 2006
  6. Jakub NarebskiDec 5, 2006
  7. Johannes SchindelinDec 5, 2006
  8. Jakub NarebskiDec 5, 2006

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.