From: Andrew Wong <andrew.kw.w@gmail.com>
Date: Wed, 26 Feb 2014 23:16:58 GMT
Subject: Re: [RFC 2/3] merge: Add hints to tell users about "git merge --abort"
Message-ID: <CADgNjakHaS5xU3G6_DpZFEUyHHjSFrXm88vwDtfCRr9eLipJaQ@mail.gmail.com>
In-Reply-To: <20140226203836.GM7855@google.com>

On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Seems reasonable, but I worry about the command growing too noisy.
>
> Could this be guarded by an advice.<something> setting?  (See advice.*
> in git-config(1) for what I mean.)

Ah, good idea. This seems to belong to advice.resolveConflict. I'll
add it there.

> `status_printf_ln` already prints a newline, so the translated message
> shouldn't include an extra one.

Good catch. Thanks!

Andrew