From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 17 Aug 2010 07:36:37 GMT
Subject: Re: [PATCH 13/24] merge script: tweak unmerged files message to match builtin
Message-ID: <AANLkTi=CTzhzO+mZ9hw4pbVaEpegZCt56bo0FzHgie36@mail.gmail.com>
In-Reply-To: <20100817070336.GM22057@burratino>

On Tue, Aug 17, 2010 at 07:03, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Before:
>
>        You are in the middle of a conflicted merge.
>
> After:
>
>        Merge is not possible because you have unmerged files.
>
> I prefer the old message.

I prefer the new one, thanks :)