Quoting Junio C Hamano <gitster@xxxxxxxxx> > # On branch side > # Unmerged paths: > # (use "git reset HEAD <file>..." to unstage) > -# (use "git add <file>..." to mark resolution) > +# (use "git add/rm <file>..." as appropriately to mark resolution) Shouldn't this either be "as appropriate" or just "appropriately"? -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- 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