This variant of the patch uses git diff -c instead of git diff HEAD, at Johannes Sixt's suggestion. The diff displayed in case of a merge conflict now shows the differences between the merge result and each of the local and remote heads and thus now also allows the user to assess the consequences of "Use Remote Version" by showing how the merge result affects the state of the local branch. I have avoided using gmail client to forward this version of patch because of documented word-wrapping issues, so hopefully this will apply cleanly. [PATCH v3 1/2] git-gui: Introduce is_unmerged global variable to encapsulate its derivation. [PATCH v3 2/2] git-gui: change to display the combined diff in the case of conflicts. jon. -- 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