From: Theodore Tso Date: Mon, 08 Oct 2007 22:01:23 GMT Subject: Re: [PATCH] mergetool: support absolute paths to tools by git config merge.path Message-ID: <20071008220123.GD31713@thunk.org> In-Reply-To: <20071008215729.GC31713@thunk.org> 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