Re: Regarding smerge upper/lower; needs NEWS

[Stefan Monnier]

> @@ -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


Let's not forget that smerge works not only for 2-part conflicts but
also for 3-part conflicts (which I think are immensely more valuable),
where the middle one is the "ancestor".  Currently, the names are
"upper/base/lower", which I find tolerable, but I'm not sure "a/base/b"
is good enough.


        Stefan