[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re
|
From: |
Stefan Monnier |
|
Subject: |
bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re' |
|
Date: |
Sat, 27 Jun 2009 02:26:44 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.94 (gnu/linux) |
> 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