[Gnu-arch-users] Re: Problem with star-merge

[Samuel Tardieu]

>>>>> "Rob" == Rob Weir <address@hidden> writes:

Rob> As someone else explained, star-merge can't handle this
Rob> situation; 'baz merge' can handle more complicated mesh
Rob> arrangments, though, perhaps it's worth a try?

Also, Darcs handles this situation just fine. We have been using it in
exactly this configuration lately, and it has been a real time saver.

  Sam
-- 
Samuel Tardieu -- address@hidden -- http://www.rfc1149.net/sam