From: Jay Soffian <jaysoffian@gmail.com>
Date: Tue, 11 Oct 2011 00:09:53 GMT
Subject: Re: [PATCH v3] Teach merge the '[-e|--edit]' option
Message-ID: <CAG+J_Dz4x7CmHKXx-9p-ZxmiuFyE2v3TFwkXfYgyc-p37ONinQ@mail.gmail.com>
In-Reply-To: <7v1uukieh2.fsf@alter.siamese.dyndns.org>

On Mon, Oct 10, 2011 at 5:00 PM, Junio C Hamano <gitster@pobox.com> wrote:
> So if we drop the "conditionally add '\n'" part in builtin/merge.c from my
> "how about this on top" patch and we should be ready to go, right?

Yes. I can send a followup patch adding an additional test case next
week (for the case where the editor zeros out the message).

Thanks Junio!

j.