[PATCH v3] Teach merge the '[-e|--edit]' option · Jay Soffian <hidden> · 2016-06-15
Re: [PATCH v3] Teach merge the '[-e|--edit]' option · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH v3] Teach merge the '[-e|--edit]' option · Jay Soffian <hidden> · 2016-06-15
Re: [PATCH v3] Teach merge the '[-e|--edit]' option · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH v3] Teach merge the '[-e|--edit]' option · Jay Soffian <hidden> · 2016-06-15
Re: [PATCH v3] Teach merge the '[-e|--edit]' option · Peter Krefting <hidden> · 2016-06-15

Re: [PATCH v3] Teach merge the '[-e|--edit]' option

From: Jay Soffian <hidden>
Date: 2016-06-15 22:52:13

On Mon, Oct 10, 2011 at 5:00 PM, Junio C Hamano [off-list ref] 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.