From: Junio C Hamano <junkio@twinsun.com>
Date: Fri, 02 Dec 2005 22:00:42 GMT
Subject: Re: More merge questions (why doesn't this work?)
Message-ID: <loom.20051202T225802-582@post.gmane.org>
In-Reply-To: <20051202213214.27282.qmail@science.horizon.com>

 <linux <at> horizon.com> writes:

> + git merge 'Merge a, b, c' master a b c
> Trying simple merge with a
> Trying simple merge with b
> Trying simple merge with c
> Simple merge did not work, trying automatic merge.
> Removing c
> fatal: merge program failed
> No merge strategy handled the merge.

I think this is the same problem I fixed yesterday after the breakage report
from Luben Tuikov.  You need the ce3ca275452cf069eb6451d6f5b0f424a6f046aa commit.
Sorry about that.

Could you try the latest and see if it still breaks?