[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Regarding smerge upper/lower; needs NEWS

From: Richard Copley
Subject: Re: Regarding smerge upper/lower; needs NEWS
Date: Thu, 15 Mar 2018 15:30:40 +0000

On 15 March 2018 at 15:04, Stefan Monnier <address@hidden> 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?


In "smerge-ediff", I think.

  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".

reply via email to

[Prev in Thread] Current Thread [Next in Thread]