undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rerere: remove i18n legos in result message

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-06-07 19:05:14 +07:00 committed by Junio C Hamano
parent 2ca0c53b31
commit 72a23e6449
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rerere.c
View File

@ -544,13 +544,13 @@ static int do_plain_rerere(struct string_list *rr, int fd)
if (has_rerere_resolution(name)) {
if (!merge(name, path)) {
if (rerere_autoupdate)
const char *msg;
if (rerere_autoupdate) {
string_list_insert(&update, path);
fprintf(stderr,
"%s '%s' using previous resolution.\n",
rerere_autoupdate
? "Staged" : "Resolved",
path);
msg = "Staged '%s' using previous resolution.\n";
} else
msg = "Resolved '%s' using previous resolution.\n";
fprintf(stderr, msg, path);
goto mark_resolved;
}
}