GNU bug report logs - #3553
23.0.60; smerge-mode: Remove trailing space in `smerge-base-re'

Previous Next

Package: emacs;

Reported by: Nelson Elhage <nelhage <at> MIT.EDU>

Date: Sat, 13 Jun 2009 17:30:03 UTC

Severity: normal

Tags: wontfix

Done: Lars Ingebrigtsen <larsi <at> gnus.org>

Bug is archived. No further changes may be made.

Full log

Message #10 received at 3553 <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Nelson Elhage <nelhage <at> MIT.EDU>
Cc: 3553 <at> debbugs.gnu.org
Subject: Re: bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re'
Date: Sat, 27 Jun 2009 02:26:44 +0200

> 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
This bug report was last modified 9 years and 150 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.