X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Frevert.c;h=00df5266d574ea1f8c9ab745ed606bac566392b5;hb=39af78961d8e7f4c0aee73e77e9eb5b6033f79c2;hp=028bcbcd75d21ada2bc0406ff74e3073014bb41f;hpb=6ea938542610f4c7b978a2d8bac00fade72ce9f1;p=git.git diff --git a/builtin/revert.c b/builtin/revert.c index 028bcbcd7..00df5266d 100644 --- 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 ' or 'git rm '"); - advise("and commit the result with 'git commit'"); - } + if (show_hint) + advise(_("after resolving the conflicts, mark the corrected paths\n" + "with 'git add ' or 'git rm '\n" + "and commit the result with 'git commit'")); } static void write_message(struct strbuf *msgbuf, const char *filename)