On Mon, Oct 10, 2011 at 5:00 PM, Junio C Hamano <gitster@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html