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>
Nguyễn Thái Ngọc Duy committed
Jun 7, 2012 at 19:05 UTC
2ca0c53b3198787ba33fe1aebb05799c09778979
1 file changed
+4
-2
notes-merge.c
+4
-2
@@ -524,8 +524,10 @@ static int merge_from_diffs(struct notes_merge_options *o,
524
free(changes);
525
526
if (o->verbosity >= 4)
527
- printf("Merge result: %i unmerged notes and a %s notes tree\n",
528
- conflicts, t->dirty ? "dirty" : "clean");
527
+ printf(t->dirty ?
528
+ "Merge result: %i unmerged notes and a dirty notes tree\n" :
529
+ "Merge result: %i unmerged notes and a clean notes tree\n",
530
+ conflicts);
531
532
return conflicts ? -1 : 1;
533
}