On Wed, Mar 25, 2009 at 11:33:52AM -0700, Junio C Hamano wrote: > Wincent Colaiuta <win@xxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
