Merge branch 'maint-1.7.8' into maint

[git.git] / builtin / revert.c

diff --git a/builtin/revert.c b/builtin/revert.c
index 0d8020cf640e1abe6898308a1656446b327c83f4..df63794e050b0a27082952f458d93e0b254ce310 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -343,11 +343,10 @@ static void print_advice(int show_hint)
                return;
        }
 
-       if (show_hint) {
-               advise("after resolving the conflicts, mark the corrected paths");
-               advise("with 'git add <paths>' or 'git rm <paths>'");
-               advise("and commit the result with 'git commit'");
-       }
+       if (show_hint)
+               advise(_("after resolving the conflicts, mark the corrected paths\n"
+                        "with 'git add <paths>' or 'git rm <paths>'\n"
+                        "and commit the result with 'git commit'"));
 }
 
 static void write_message(struct strbuf *msgbuf, const char *filename)