Junio C Hamano wrote: > In a combined diff, unlike the single column to show "+/-/ " at the > beginning for one-parent diff, each parent gets one column. And in a > condensed combined diff, a hunk whose result is inherited solely from one > parent (iow, a trivial conflict resolution) is removed from the output, so > that only a non-trivial conflict resolution that leaves result that is > different from all parents are shown. Thank you Junio and Shawn for the very clear explanation! Now it makes very good sense why the patch looks so "weird" :) For cases where both branches touch the same file and there is a conflict, this would be very useful indeed. Cheers, Adam -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
