diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-06-07 19:05:13 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-07 11:58:09 -0700 |
| commit | 2ca0c53b3198787ba33fe1aebb05799c09778979 (patch) | |
| tree | 418e7e6c9c926aa7a833b76a4240e9d74dcbee95 /notes-merge.c | |
| parent | 95cfe9588aaa4036913a6d10fd309ce3a3d23f3b (diff) | |
| download | git-2ca0c53b3198787ba33fe1aebb05799c09778979.tar.gz git-2ca0c53b3198787ba33fe1aebb05799c09778979.tar.xz | |
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>
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 74aa77ce4..29c6411fc 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; } |