From: Stephen Boyd <bebarino@gmail.com>
Date: Sat, 02 Oct 2010 08:55:33 GMT
Subject: Re: [PATCH 12/18] Documentation: Preliminary docs on 'git notes merge'
Message-ID: <4CA6F385.7030207@gmail.com>
In-Reply-To: <1285719811-10871-13-git-send-email-johan@herland.net>

On 09/28/2010 05:23 PM, Johan Herland wrote:
> ++
> +If conflicts arise (and a strategy for automatically resolving
> +conflicting notes (see the -s/--strategy option) is not given,
> +the merge fails (TODO).

Unbalanced '(' here. Can you just drop the first one?