Max Kirillov <m...@max630.net> 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
