From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Apr 2014 19:55:21 GMT
Subject: Re: [PATCH 2/2] mergetool: run prompt only if guessed tool
Message-ID: <xmqqioq13zrq.fsf@gitster.dls.corp.google.com>
In-Reply-To: <xmqq38h56zj0.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> 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.