Resending because my original patch series wasn't whitespace clean and I have now removed the configuration to make the safe behaviour optional - it is not safe by default. If there is any other reason why this patch should not be considered, please let me know. [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to encapsulate its derivation. [PATCH v2 2/2] git-gui: change to display the diff with the HEAD 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