From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 05 Dec 2006 00:01:55 GMT
Subject: Re: [PATCH] merge-recursive: configurable 'merge' program
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