Skip to content

Commit

Permalink
Merge branch 'mg/wt-status-mismarked-i18n'
Browse files Browse the repository at this point in the history
* mg/wt-status-mismarked-i18n:
  wt-status: allow "ahead " to be picked up by l10n
  • Loading branch information
Junio C Hamano committed Mar 14, 2016
2 parents ed9067f + df22724 commit db6696f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions wt-status.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit db6696f

Please sign in to comment.