From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Thu, 7 Jun 2012 12:05:13 +0000 (+0700)
Subject: notes-merge: remove i18n legos in merge result message
X-Git-Tag: v1.7.12-rc0~86^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2ca0c53b3198787ba33fe1aebb05799c09778979?ds=sidebyside;hp=95cfe9588aaa4036913a6d10fd309ce3a3d23f3b

notes-merge: remove i18n legos in merge result message

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/notes-merge.c b/notes-merge.c
index 74aa77ce4b..29c6411fc6 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -524,8 +524,10 @@ static int merge_from_diffs(struct notes_merge_options *o,
 	free(changes);
 
 	if (o->verbosity >= 4)
-		printf("Merge result: %i unmerged notes and a %s notes tree\n",
-			conflicts, t->dirty ? "dirty" : "clean");
+		printf(t->dirty ?
+		       "Merge result: %i unmerged notes and a dirty notes tree\n" :
+		       "Merge result: %i unmerged notes and a clean notes tree\n",
+		       conflicts);
 
 	return conflicts ? -1 : 1;
 }