From: Junio C Hamano Date: Mon, 19 Mar 2007 04:09:29 GMT Subject: Re: [PATCH] mergetool: Use merge.tool config option. Message-ID: <7vircxnabq.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20070319023238.GC11371@thunk.org> Theodore Tso writes: > It seemed to me that Junio's suggestion made the most amount of sense, > but I tinkered with the with the warning message to make it clear that > the cause of the warning was a bugus tool in the merge.tool > configuration parameter. > > This has also been pushed out to git://repo.or.cz/git/mergetool.git > > Junio, please pull if you approve... Surely, and thanks. I think your message is much nicer.