Permalink
Browse files

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>
  • Loading branch information...
pclouds authored and gitster committed Jun 7, 2012
1 parent 95cfe95 commit 2ca0c53b3198787ba33fe1aebb05799c09778979
Showing with 4 additions and 2 deletions.
  1. +4 −2 notes-merge.c
View
@@ -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;
}

0 comments on commit 2ca0c53

Please sign in to comment.