rerere: remove i18n legos in result message
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jun 7, 2012 at 19:05 UTC
72a23e6449bc29358760b2ccdfacbd9aa37e9b36
1 file changed
+6
-6
rerere.c
+6
-6
@@ -544,13 +544,13 @@ static int do_plain_rerere(struct string_list *rr, int fd)
544
545
if (has_rerere_resolution(name)) {
546
if (!merge(name, path)) {
547
- if (rerere_autoupdate)
547
+ const char *msg;
548
+ if (rerere_autoupdate) {
549
string_list_insert(&update, path);
549
- fprintf(stderr,
550
- "%s '%s' using previous resolution.\n",
551
- rerere_autoupdate
552
- ? "Staged" : "Resolved",
553
- path);
550
+ msg = "Staged '%s' using previous resolution.\n";
551
+ } else
552
+ msg = "Resolved '%s' using previous resolution.\n";
553
+ fprintf(stderr, msg, path);
554
goto mark_resolved;
555
}
556
}