Re: SEGV in git-merge recursive:

From: Tom Prince <tom.prince@ualberta.net>
Date: Mar 29, 2007, 12:58 UTC
Message-ID: <20070329125803.GA16739@hermes>
In-Reply-To: <81b0412b0703290429k63642a34u6bea1e08803ffba7@mail.gmail.com>

On Thu, Mar 29, 2007 at 01:29:46PM +0200, Alex Riesen wrote:

Show 8 quoted lines

> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.