From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 29 Sep 2010 16:19:30 GMT
Subject: Re: [PATCH 14/18] git notes merge: Manual conflict resolution, part 2/2
Message-ID: <AANLkTimzii1TEqRY40idz_i8qXHGFnoCZa29eH31U6n7@mail.gmail.com>
In-Reply-To: <1285719811-10871-15-git-send-email-johan@herland.net>

On Wed, Sep 29, 2010 at 00:23, Johan Herland <johan@herland.net> wrote:

> +--commit::
> +       Finalize an in-progress 'git notes merge', i.e. a notes merge with
> +       conflicts. When 'git notes merge' encounters conflicts, it s
> +       which returned one or more conflicts (that you have now resolved)

This "it s ..." sentence doesn't make sense.