Re: Regarding smerge upper/lower; needs NEWS

[Noam Postavsky]

On Fri, Apr 7, 2017 at 3:53 PM, Richard Copley <address@hidden> wrote:
>
> Sorry again, I didn't mean to be mysterious. Think of me as just a
> stupid user. (I am just a stupid user.)
>
> Here's what happens, but please be sympathetic, because I haven't
> taken the trouble to create an artificial merge conflict in order to
> create an exact recipe. This is from memory and some of the details
> are very likely wrong.
>
> I attempt an SVN merge which fails and leaves the file conflicted.
>
> I visit the resulting file, containing conflict markers, in Emacs.
>
> The buffer's in SMerge mode or something (I guess because of
> magic-mode-alist but I didn't debug to check).
>
> Think: now I want to use Ediff (Ediff is why I use Emacs). How?
>
> C-h m
>
> Seems like it's something totally weird and impossible to remember.
> ([C-x ^ e]? I really don't remember, I'd have to check.)
> OK, yuck! But let's try it.
>
> Bang! UPPER on the left and LOWER on the right, with something else
> entirely underneath.
>
> It's not exactly difficult to deal with, but it's distracting.

Ah, I think I get it now. Does this help:

--- i/lisp/vc/smerge-mode.el
+++ w/lisp/vc/smerge-mode.el
@@ -1247,12 +1247,12 @@ smerge-ediff
      (upper (generate-new-buffer
         (or name-upper
                     (concat "*" filename " "
-                            (smerge--get-marker smerge-begin-re "UPPER")
+                            (smerge--get-marker smerge-begin-re "A")
                             "*"))))
      (lower (generate-new-buffer
          (or name-lower
                      (concat "*" filename " "
-                             (smerge--get-marker smerge-end-re "LOWER")
+                             (smerge--get-marker smerge-end-re "B")
                              "*"))))
      base)
     (with-current-buffer upper