Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:04:24

Max Kirillov [off-list ref] writes:
My exact case was that there was a change in one branch
which was overwritten during merge conflict resolution by
fully acepting the other branch - in a 2-parent merge. I
started looking for a way to visualize such cases. They
are not visible in usual diff, because they look same as
accepting change compared to the unchange branch.
Hmph, isn't that exactly why "diff -c" exists, not "diff --cc"
that omits (usually) uninteresting hunks?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help