diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:14 -0800 |
| commit | 87a23e77c6ffc5713eff3a4a4da036731da2dc3f (patch) | |
| tree | c27eb251dd5637829ec2ce5c8d50f5298c13a1de /builtin | |
| parent | aad070922157d3249af7095ecff6ebc074c13bb9 (diff) | |
| parent | 23cb5bf3b3b9699bf00fa38c4c08f32f8c60b529 (diff) | |
| download | git-87a23e77c6ffc5713eff3a4a4da036731da2dc3f.tar.gz git-87a23e77c6ffc5713eff3a4a4da036731da2dc3f.tar.xz | |
Merge branch 'jc/advise-i18n'
* 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 0d8020cf6..df63794e0 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) |