Hey, Is it possible to get git to use patience diff when merging? My version of git is 1.5.*, from before git diff had the --patience option. I got git diff to use bzr's implementation of patience diff via GIT_EXTERNAL_DIFF. But when merging git still seems to use its normal diff. Will I need to write my own merge driver that uses patience diff? Thanks -- 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