Re: [PATCH 2/2] mergetool: run prompt only if guessed tool
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:00:47
Junio C Hamano [off-list ref] writes:
Do you have reaction to the other one "[PATCH 1/2] merge: enable defaulttoupstream by default"?
Sorry, that other one is not even about difftool/mergetool. I just checked that patch myself, and found it sensible for the longer term.