From: Nguyễn Thái Ngọc Duy Date: Thu, 07 Jun 2012 12:05:14 GMT Subject: [PATCH 5/6] rerere: remove i18n legos in result message Message-ID: <1339070715-31417-5-git-send-email-pclouds@gmail.com> In-Reply-To: <1339070715-31417-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- rerere.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rerere.c b/rerere.c index dcb525a..da18fc3 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; } } -- 1.7.8