From: Stefan Beller <sbeller@google.com>
Date: Thu, 21 Jul 2016 16:58:35 GMT
Subject: Re: [RFC/PATCH] status: suggest 'git merge --abort' when appropriate
Message-ID: <CAGZ79kZ5So-tXRX60CTCxrsgW8Vv7QH5gXGDk89EP69Qk28Kcw@mail.gmail.com>
In-Reply-To: <20160721125837.3127-1-Matthieu.Moy@imag.fr>

On Thu, Jul 21, 2016 at 5:58 AM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:
> We already suggest 'git rebase --abort' during a conflicted rebase.
> Similarly, suggest 'git merge --abort' during conflict resolution on
> 'git merge'.

I think this is a good addition.

Thanks,
Stefan