diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-25 11:24:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-25 11:24:37 -0700 |
| commit | efc478d42e705ad020de008cd852a6b7ade3058f (patch) | |
| tree | ad99b483ae10fb8cd978f19ba89bc30a49b879cd /notes-merge.c | |
| parent | Merge branch 'nd/i18n-branch-lego' (diff) | |
| parent | rerere: remove i18n legos in result message (diff) | |
| download | tgif-efc478d42e705ad020de008cd852a6b7ade3058f.tar.xz | |
Merge branch 'nd/i18n-misc'
Restructure the way message strings are created, in preparation for
marking them for i18n.
* nd/i18n-misc:
rerere: remove i18n legos in result message
notes-merge: remove i18n legos in merge result message
reflog: remove i18n legos in pruning message
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 74aa77ce4b..29c6411fc6 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; } |