Re: [PATCH] xdl_merge(): fix and simplify conflict handling

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