diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:53:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:53:30 -0700 |
| commit | 0f360763c02d1230614e23f94fb298dab0162aa0 (patch) | |
| tree | 3c4645bcc34807e9a63b904ea163cc73b8ddd970 /builtin/revert.c | |
| parent | Git 1.7.9.4 (diff) | |
| parent | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 (diff) | |
| download | tgif-0f360763c02d1230614e23f94fb298dab0162aa0.tar.xz | |
Merge branch 'maint-1.7.8' into maint
* maint-1.7.8:
t/Makefile: Use $(sort ...) explicitly where needed
gitweb: Fix actionless dispatch for non-existent objects
i18n of multi-line advice messages
Diffstat (limited to 'builtin/revert.c')
| -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 0d8020cf64..df63794e05 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) |