On Sat, Apr 11, 2015 at 10:51:10PM -0700, Junio C Hamano wrote: > Max Kirillov <[email protected]> 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?
No, this shows too many. If a change is done in one branch but the other branch did not introduce any changes since mergebase and they merged cleanly the merge should not be shown, and `diff -c` seems to show them. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
