diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-17 01:59:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-17 01:59:53 +0400 |
| commit | e6d88ca87cbb3d89d639a3ee769486f44f9a33b8 (patch) | |
| tree | 0aebf2fcb42700fbc813819ec219afd4994201ed /builtin | |
| parent | 68e4b552a1b82343bcefa5d68fa344314b150cc8 (diff) | |
| parent | 8a5b749428d39a0e85fb0f76306b88945cb5c6e0 (diff) | |
Merge branch 'jx/i18n-more-marking' into maint
* jx/i18n-more-marking:
i18n: format_tracking_info "Your branch is behind" message
i18n: git-commit whence_s "merge/cherry-pick" message
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 2deccb5444..eae5a29aeb 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -196,16 +196,16 @@ static void determine_whence(struct wt_status *s) static const char *whence_s(void) { - char *s = ""; + const char *s = ""; switch (whence) { case FROM_COMMIT: break; case FROM_MERGE: - s = "merge"; + s = _("merge"); break; case FROM_CHERRY_PICK: - s = "cherry-pick"; + s = _("cherry-pick"); break; } |