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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html