Re: [PATCH] Grammar fixes to "merge" and "patch-id" docs
From: Jeff King <hidden>
Date: 2016-06-15 22:46:28
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] Grammar fixes to "merge" and "patch-id" docs · Wincent Colaiuta <hidden>
On Wed, Mar 25, 2009 at 11:33:52AM -0700, Junio C Hamano wrote:
Wincent Colaiuta [off-list ref] writes:quoted
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