From: Johan Herland <johan@herland.net>
Date: Mon, 04 Oct 2010 15:15:08 GMT
Subject: Re: [PATCH 12/18] Documentation: Preliminary docs on 'git notes merge'
Message-ID: <201010041715.08879.johan@herland.net>
In-Reply-To: <4CA6F385.7030207@gmail.com>

On Saturday 2. October 2010 10.55.33 Stephen Boyd wrote:
> 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?

Done. Will be in next iteration.


Thanks,

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net