From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 05 Dec 2006 22:27:44 GMT
Subject: Re: [PATCH] xdl_merge(): fix and simplify conflict handling
Message-ID: <Pine.LNX.4.63.0612052327210.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <el4rko$aqe$1@sea.gmane.org>

Hi,

On Tue, 5 Dec 2006, Jakub Narebski wrote:

> Junio C Hamano wrote:
> 
> > Looking at some other cases after applying your patch, I noticed
> > that I really like one thing that your version does over what
> > RCS merge does.
> 
> Is it with "try harder" option?

Yes, it uses the XDL_MERGE_ZEALOUS option.

Ciao,
Dscho