From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 05 Dec 2006 07:38:21 GMT
Subject: Re: [PATCH] merge-recursive: configurable 'merge' program
Message-ID: <Pine.LNX.4.63.0612050836570.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <el2cpj$cna$1@sea.gmane.org>

Hi,

On Tue, 5 Dec 2006, Jakub Narebski wrote:

> 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?

Not a big problem. If people like Sam's patch, it is easy to integrate, 
since it only means that if merge.tool is set to something non-empty, 
xdl_merge is not called, but the merge.tool is forked.

Ciao,
Dscho