mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/advise-i18n' into maint-1.7.8

Browse Source 
* jc/advise-i18n:
  i18n of multi-line advice messages
This commit is contained in:
Junio C Hamano
2012-03-20 15:25:38 -07:00
parent bd193f46b7 23cb5bf3b3
commit 39af78961d
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/revert.c
View File

@ -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)