From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 05 Dec 2006 22:27:37 GMT
Subject: Re: [PATCH] xdl_merge(): fix and simplify conflict handling
Message-ID: <el4rko$aqe$1@sea.gmane.org>
In-Reply-To: <7vvekqf0yh.fsf@assigned-by-dhcp.cox.net>

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?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git