kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Nguyễn Thái Ngọc Duy 2012-06-07 19:05:13 +07:00 committed by Junio C Hamano
parent 95cfe9588a
commit 2ca0c53b31
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
notes-merge.c
View File

@ -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;
}