From: Fredrik Kuivinen Date: Sat, 03 Sep 2005 19:21:38 GMT Subject: Re: Moved files and merges Message-ID: <20050903192137.GC2314@c165.ib.student.liu.se> In-Reply-To: <7vy86erntu.fsf@assigned-by-dhcp.cox.net> On Sat, Sep 03, 2005 at 11:46:53AM -0700, Junio C Hamano wrote: [lots of good stuff] I obviously misunderstood the complexity of this merge case. Thank you for the explanation. - Fredrik