Hi Arjen, The version of your patch which I just checked into my sources fixes the issues which Junio raised (whitespace issues, double quotes, factoring out common code). The other change I made was that I changed the search order so that by default opendiff is preferred over emerge (on the assumption that MacOS developers are more likely to want to use the GUI merge tool than emacs's merge tool). Of course, people are free to set whatever they choose in their .gitconfig file. Thanks for the patch! - Ted - 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