From: Alex Riesen Date: Thu, 29 Mar 2007 18:55:01 GMT Subject: Re: SEGV in git-merge recursive: Message-ID: <20070329185501.GC2809@steel.home> In-Reply-To: <20070329183237.GB2809@steel.home> Alex Riesen, Thu, Mar 29, 2007 20:32:37 +0200: > > The structure looks like this: > > o---o-o-o---o-o-o-o-o > \ ____\_/ > \ / \ > o-------o-o-o-o > And this is a repo (reconstructed, not the original, of course) which shows the problem. Just run "git merge merge" while on master.