diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-14 10:46:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-14 10:46:17 -0700 |
| commit | db6696f653b917509dac1ac13b922e12773a84ff (patch) | |
| tree | fe5de29030f728b5bebbdc22ff062b42a0f7e557 /wt-status.c | |
| parent | ed9067f705aa51819c7dfff7e4190dd267beaf5d (diff) | |
| parent | df227241ddd7aa6b94e1d1dcdc3999f34c819119 (diff) | |
| download | git-db6696f653b917509dac1ac13b922e12773a84ff.tar.gz | |
Merge branch 'mg/wt-status-mismarked-i18n'
* mg/wt-status-mismarked-i18n:
wt-status: allow "ahead " to be picked up by l10n
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index ab4f80d6d0..ef7486474a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1677,10 +1677,10 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) color_fprintf(s->fp, header_color, LABEL(N_("behind "))); color_fprintf(s->fp, branch_color_remote, "%d", num_theirs); } else if (!num_theirs) { - color_fprintf(s->fp, header_color, LABEL(N_(("ahead ")))); + color_fprintf(s->fp, header_color, LABEL(N_("ahead "))); color_fprintf(s->fp, branch_color_local, "%d", num_ours); } else { - color_fprintf(s->fp, header_color, LABEL(N_(("ahead ")))); + color_fprintf(s->fp, header_color, LABEL(N_("ahead "))); color_fprintf(s->fp, branch_color_local, "%d", num_ours); color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind "))); color_fprintf(s->fp, branch_color_remote, "%d", num_theirs); |