Re: [PATCH] Always output a trailing space conflicted merge markers.

Quoting Junio C Hamano [off-list ref]:

Nelson Elhage [off-list ref] writes:

quoted

Some tools, such as emacs' smerge-mode, except that diff3-style merge
conflict markers always include a trailing space (and optional
description) after the marker, and so fail to correctly detect
git's (notably the '|||||||' base marker, for which git never outputs a
trailing space).

(See http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3553
for the emacs issue)

Signed-off-by: Nelson Elhage <redacted>
---
 xdiff/xmerge.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

Thanks, but I think you also need to update the test scripts.

Don't you want some new tests to protect this from getting broken
in the future by other people yourself, too?

I don't know what future breakages Nelson wants to protect his code from, but this change breaks the test for union merge in t6026-merge-attr.sh.

It isn't that the test script expects no space after the conflict marker, but with Nelson's patch, the union merge no longer works.

I request this patch to be dropped.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/