Theodore Tso [off-list ref] 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.