On 3/29/07, Tom Prince <tom.prince@xxxxxxxxxxxx> wrote:
On Thu, Mar 29, 2007 at 01:29:46PM +0200, Alex Riesen wrote: > On 3/29/07, Tom Prince <tom.prince@xxxxxxxxxxxx> 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? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html