diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-06-07 16:05:14 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-07 22:58:10 +0400 |
commit | 72a23e6449bc29358760b2ccdfacbd9aa37e9b36 (patch) | |
tree | acaedf8ffed1661e58537fc1b139bbb239080c5f | |
parent | 2ca0c53b3198787ba33fe1aebb05799c09778979 (diff) |
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>
-rw-r--r-- | rerere.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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; } } |