From: Nguyễn Thái Ngọc Duy Date: Thu, 31 May 2012 13:04:40 GMT Subject: [PATCH 4/6] notes-merge: remove i18n legos in merge result message Message-ID: <1338469482-30936-5-git-send-email-pclouds@gmail.com> In-Reply-To: <1338469482-30936-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- notes-merge.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 74aa77c..43d5ce0 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -523,9 +523,14 @@ static int merge_from_diffs(struct notes_merge_options *o, conflicts = merge_changes(o, changes, &num_changes, t); free(changes); - if (o->verbosity >= 4) - printf("Merge result: %i unmerged notes and a %s notes tree\n", - conflicts, t->dirty ? "dirty" : "clean"); + if (o->verbosity >= 4) { + if (t->dirty) + printf("Merge result: %i unmerged notes and a dirty notes tree\n", + conflicts); + else + printf("Merge result: %i unmerged notes and a clean notes tree\n", + conflicts); + } return conflicts ? -1 : 1; } -- 1.7.10.2.549.g9354186