Thread (3 messages) 3 messages, 2 authors, 2016-06-15

Re: [PATCH 2/2 - RFH/WIP] xdiff-merge: optionally show conflicts in "diff3 -m" style

flat view

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:15

Possibly related (same subject, not in this thread)

Linus Torvalds [off-list ref] writes:
On Thu, 28 Aug 2008, Junio C Hamano wrote:
quoted
Some poeple find it easier to be able to understand what is going on when
they can view the common ancestor's version, which is used by "diff3 -m",
which shows:

 <<<<<<<
 postimage from one side;
 |||||||
 shared preimage;
 =======
 postimage of the other side; and
 >>>>>>>

This is an initial step to bring that as an optional feature to git.
Only "git merge-file" has been converted, with "--diff3" option.
If you have the common ancestor, why would you ever want this format, and 
not a nice conflict entry in the index?
We already have that, don't we?  You can think of it as how to present
that information without resorting to "diff :1:path :2:path".
Anyway, that's irrelevant for my real question, which is:
... the same thing as I already said after three-dashes, hence RFH/WIP.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help