On Mon, Oct 08, 2007 at 05:57:29PM -0400, Theodore Tso wrote: > This patch doesn't work the config file doesn't specify an explicit > mergetool via merge.tool. The reason for that is this loop: Err, let me try that again. "This patch doesn't work IF the config file doesn't specify an explicit > mergetool via merge.tool." Sorry about the missing conjuction; the sentence doesn't make much sense without it... - 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