Apparently setting merge.conflictstyle to diff3 will display the base when diffing an incomplete merge, instead of just ours and theirs. Is there a way to run this command without setting the config, so that I can switch between normal diffs and diff3s easily? -- 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