From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 05 Mar 2014 21:20:45 GMT
Subject: Re: [RFC 2/3] merge: Add hints to tell users about "git merge --abort"
Message-ID: <xmqqob1kfiky.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CADgNjamZE5140U2vupgZMKyBq+e22+qOAAWKe=iRk7sxzhonvA@mail.gmail.com>

Andrew Wong <andrew.kw.w@gmail.com> writes:

> ... merge hints in the future as well.

I actually wish we did not have to add any hints in the first place.

> Having one advice config/variable
> for every single situation seems a bit overkill, and we would end up
> with too many variables.

That goes without saying.