From: Elijah Newren <newren@gmail.com>
Date: Thu, 04 Aug 2011 02:12:25 GMT
Subject: Re: [PATCH 00/48] Handling more corner cases in merge-recursive.c
Message-ID: <CABPp-BHUuCMNMdVM20M2tPVQvDRmsTGRwfLoYW3-cgKHWXJ8Zg@mail.gmail.com>
In-Reply-To: <7vaabq6j6g.fsf@alter.siamese.dyndns.org>

On Wed, Aug 3, 2011 at 7:48 PM, Junio C Hamano <gitster@pobox.com> wrote:
> A very simple reproduction recipe.

Thanks, I'll take a look this weekend.  I'm a little surprised that
you mentioned merging this to next already; I was assuming you wanted
me to address the various things you pointed out in your reviews first
(as well as the comments from Johannes).  I've been swamped at work,
particularly after trying to catch up on the pile of work accumulated
during my vacation, but should have time again this weekend...finally.


Elijah