Re: Regarding smerge upper/lower; needs NEWS

[Richard Copley <rcopley@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1210 bytes --]

On 15 March 2018 at 15:04, Stefan Monnier <monnier@iro.umontreal.ca> wrote:

> > "A" and "B" are the names diff3 uses for the conflict markers.
> > "A" and "B" are the names used in the documentation.
> > "UPPER" and "LOWER" are useless since they don't match up with anything
> > else (the conflict markers and the documentation).
>
> They match up with the location of the corresponding chunk of text, tho.
>
> > "UPPER" and "LOWER" are confusing since they are often shown on the left
> > and right respectively.
>
> In SMerge? In which circumstance would it be the case?
>
>
>         Stefan
>

In "smerge-ediff", I think.

Suppose
  git checkout xxx
  git merge master
leaves merge conflicts.
Visit a conflicted file and type C-c ^ E.

If merge.conflictstyle=diff3 I get (for example):

top-left: "*main.cpp UPPER=HEAD*"
top-right: "*main.cpp LOWER=master*"
bottom-left: "*ediff-merge*"
bottom-right: "*main.cpp BASE=merged common ancestors*"

Or with git's default (no merge.conflictstyle configured):

top-left: "*main.cpp UPPER=HEAD*"
top-right: "*main.cpp LOWER=master*"
bottom: "*ediff-merge*"

And in the "*ediff-merge*" buffer, the conflict markers are "<<<<<<<
variant A" and ">>>>>>> variant B".

[-- Attachment #2: Type: text/html, Size: 2622 bytes --]