From: Jeff King <peff@peff.net>
Date: Sat, 07 May 2011 01:46:34 GMT
Subject: Re: What's cooking in git.git (May 2011, #03; Fri, 6)
Message-ID: <20110507014634.GB25771@sigill.intra.peff.net>
In-Reply-To: <7v7ha3xvm1.fsf@alter.siamese.dyndns.org>

On Fri, May 06, 2011 at 04:22:30PM -0700, Junio C Hamano wrote:

> * jk/merge-one-file-working-tree (2011-04-29) 2 commits
>   (merged to 'next' on 2011-05-02 at 308fe21)
>  + merge-one-file: fix broken merges with alternate work trees
>  + add tests for merge-index / merge-one-file

Hmm, I expected this to end up on maint. Is it worth cherry-picking
(it cleanly applies to maint)?

-Peff