Merge branch 'ar/i18n-no-gettext'

[git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 54771196c37d32e78663322d98a4a32f6a947e28..5fcbcb8875454574f4d3a52b5d1ac84b99452ba7 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -138,11 +138,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)