Merge branch 'maint' into HEAD

[git.git] / builtin-revert.c

diff --git a/builtin-revert.c b/builtin-revert.c
index a655c8ee2ab25ef778b182fbd5ff298a732c1cfd..e855b206cf030c5e907d94b171fbbfe3b9601a2b 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -349,7 +349,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
                        die ("Error wrapping up %s", defmsg);
                fprintf(stderr, "Automatic %s failed.  "
                        "After resolving the conflicts,\n"
-                       "mark the corrected paths with 'git-add <paths>'\n"
+                       "mark the corrected paths with 'git add <paths>' "
                        "and commit the result.\n", me);
                if (action == CHERRY_PICK) {
                        fprintf(stderr, "When commiting, use the option "