diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-20 22:25:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-20 22:25:38 (GMT) |
| commit | 39af78961d8e7f4c0aee73e77e9eb5b6033f79c2 (patch) | |
| tree | 03df3de35df25fa5aae34b993fb7da8eb383a462 /builtin | |
| parent | bd193f46b70fd3f8a55e2a8dcbb1fb2b4eec13d6 (diff) | |
| parent | 23cb5bf3b3b9699bf00fa38c4c08f32f8c60b529 (diff) | |
| download | git-39af78961d8e7f4c0aee73e77e9eb5b6033f79c2.zip git-39af78961d8e7f4c0aee73e77e9eb5b6033f79c2.tar.gz git-39af78961d8e7f4c0aee73e77e9eb5b6033f79c2.tar.bz2 | |
Merge branch 'jc/advise-i18n' into maint-1.7.8
* jc/advise-i18n:
i18n of multi-line advice messages
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/revert.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 028bcbc..00df526 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 <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) |