From: Nguyễn Thái Ngọc Duy Date: Thu, 07 Jun 2012 12:05:13 GMT Subject: [PATCH 4/6] notes-merge: remove i18n legos in merge result message Message-ID: <1339070715-31417-4-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 --- notes-merge.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 74aa77c..29c6411 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; } -- 1.7.8