Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: Remove diff machinery dependency from read-cache

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:04

Johannes Schindelin [off-list ref] writes:
On Thu, 21 Jan 2010, Junio C Hamano wrote:
quoted
By the way, do you think anybody still uses "git merge-trees"?
IMO this is the only viable way to a non-broken merge-recursive.  Removing 
it would be counterproductive.
Do you mean you don't think

    Subject: Re: git-merge segfault in 1.6.6 and master
    Date: Thu, 21 Jan 2010 16:38:56 -0800
    Message-ID: [ref]

    ...
    In the meantime, I think applying this patch is the right thing to do.

    -- >8 --
    Subject: merge-recursive: do not return NULL only to cause segfault

would help us?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help