From: Jeff King <peff@peff.net>
Date: Thu, 26 Mar 2009 02:20:07 GMT
Subject: Re: [PATCH] Grammar fixes to "merge" and "patch-id" docs
Message-ID: <20090326022006.GB5835@coredump.intra.peff.net>
In-Reply-To: <7vocvp310v.fsf@gitster.siamese.dyndns.org>

On Wed, Mar 25, 2009 at 11:33:52AM -0700, Junio C Hamano wrote:

> Wincent Colaiuta <win@wincent.com> writes:
> 
> >  If you tried a merge which resulted in a complex conflicts and
> > -would want to start over, you can recover with 'git-reset'.
> > +want to start over, you can recover with 'git-reset'.
> 
> Reads Ok to me either way...

Wincent gave a more complete explanation, and I think he is right about
this change. But while reading this I also noticed "... a complex
conflicts ..." in the context line which should be just "complex
conflicts".

-Peff