From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 29 Aug 2014 06:44:09 GMT
Subject: Re: [PATCH] merge, pull: stop advising 'commit -a' in case of conflict
Message-ID: <vpqegvzu75y.fsf@anie.imag.fr>
In-Reply-To: <xmqqppfka2bb.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

> Here is how I phrased in the one queued tentatively.

OK with me, thanks,

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/