Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Nelson Elhage <nelhage@MIT.EDU>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Always output a trailing space conflicted merge markers.
Date: Tue, 30 Jun 2009 15:20:09 -0700	[thread overview]
Message-ID: <7v1vp15ppi.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1246322461-24742-1-git-send-email-nelhage@mit.edu> (Nelson Elhage's message of "Mon\, 29 Jun 2009 20\:41\:01 -0400")

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?

  reply	other threads:[~2009-06-30 22:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-30  0:41 [PATCH] Always output a trailing space conflicted merge markers Nelson Elhage
2009-06-30 22:20 ` Junio C Hamano [this message]
2009-07-01  2:01   ` Junio C Hamano
2009-07-01  3:42   ` Nanako Shiraishi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v1vp15ppi.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=nelhage@MIT.EDU \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox