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

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 1, 2009, 02:01 UTC
Message-ID: <7vzlbpxitn.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7v1vp15ppi.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 20 quoted lines

> 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?

I actually changed my mind. The plain "diff3" (from GNU diffutils 2.8.1) does not seem to give an trailing space after ||||||| separator. It feels very wrong to change the output format to work around a bug in smerge-mode (which I never use, by the way), if we are not the only offender. With this change, we may be breaking something else that relied on the "diff3" output format that does not have such a trailing space.

I'll drop this patch.