From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Jun 2009 22:20:09 GMT
Subject: Re: [PATCH] Always output a trailing space conflicted merge markers.
Message-ID: <7v1vp15ppi.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1246322461-24742-1-git-send-email-nelhage@mit.edu>

Nelson Elhage <nelhage@MIT.EDU> writes:

> 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 <nelhage@mit.edu>
> ---
>  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?