summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-06-07 19:05:14 +0700
committerJunio C Hamano <gitster@pobox.com>2012-06-07 11:58:10 -0700
commit72a23e6449bc29358760b2ccdfacbd9aa37e9b36 (patch)
treeacaedf8ffed1661e58537fc1b139bbb239080c5f /rerere.c
parent2ca0c53b3198787ba33fe1aebb05799c09778979 (diff)
downloadgit-72a23e6449bc29358760b2ccdfacbd9aa37e9b36.tar.gz
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>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/rerere.c b/rerere.c
index dcb525a4d0..da18fc37df 100644
--- a/rerere.c
+++ b/rerere.c
@@ -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;
}
}