On Wed, Sep 29, 2010 at 00:23, Johan Herland <johan@xxxxxxxxxxx> wrote: > +--commit:: > + Â Â Â Finalize an in-progress 'git notes merge', i.e. a notes merge with > + Â Â Â conflicts. When 'git notes merge' encounters conflicts, it s > + Â Â Â which returned one or more conflicts (that you have now resolved) This "it s ..." sentence doesn't make sense. -- 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