From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 29 Mar 2007 13:34:00 GMT
Subject: Re: SEGV in git-merge recursive:
Message-ID: <81b0412b0703290634j6e62ba89tce3c8c963be3fb92@mail.gmail.com>
In-Reply-To: <20070329125803.GA16739@hermes>

On 3/29/07, Tom Prince <tom.prince@ualberta.net> wrote:
> On Thu, Mar 29, 2007 at 01:29:46PM +0200, Alex Riesen wrote:
> > On 3/29/07, Tom Prince <tom.prince@ualberta.net> wrote:
> > >I have been keeping my Maildir in git, a non-trivial merge that causes a
> > >segfault in git-merge-recursive.
> > >
> > >It does not appear to matter which direction I try to merge.
> > >
> >
> > BTW, what git do you have? git --version?
>
> 1.5.1.rc3
>

Did it crash before? If it didn't, is it possible for you to bisect
the commit which caused the problem?