From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Nelson Elhage <nelhage@MIT.EDU>
Cc: 3553@emacsbugs.donarmstrong.com
Subject: bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re'
Date: Sat, 27 Jun 2009 02:26:44 +0200 [thread overview]
Message-ID: <jwvvdmiiktp.fsf-monnier+emacsbugreports@gnu.org> (raw)
In-Reply-To: <200906131725.n5DHPaEt009392@outgoing.mit.edu> (Nelson Elhage's message of "Sat, 13 Jun 2009 13:25:36 -0400 (EDT)")
> With merge.conflictstyle=diff3, 'git' generates diff3-style conflict
> markers, with mine/base/other sections, but for the 'base' marker, it
> only outputs "|||||||\n", with no comment after it. This causes smerge
> to miss the base marker, since smerge assumes a comment, and defines:
> (defconst smerge-base-re "^||||||| .*\n")
> Simply replacing that with
> (defconst smerge-base-re "^|||||||.*\n")
> Should allow smerge-mode to handle git conflicts, and I can't imagine
> it should cause any false-positives otherwise.
I'd rather fix Git so it uses the standard format.
Stefan
prev parent reply other threads:[~2009-06-27 0:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-13 17:25 bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re' Nelson Elhage
2009-06-27 0:26 ` Stefan Monnier [this message]
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=jwvvdmiiktp.fsf-monnier+emacsbugreports@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=3553@emacsbugs.donarmstrong.com \
--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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.