Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] mergetool: Use merge.tool config option.

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:00

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help