diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-07 12:56:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-07 12:56:54 -0800 |
| commit | 6f1ede842351ee6c822b7904a9d55a6720992aa8 (patch) | |
| tree | 90a696c02173726c33049f606e83060a5ff9898a /builtin | |
| parent | 12b681c3d2306fefa949c2e04d36e4f888917507 (diff) | |
| parent | 8a5b749428d39a0e85fb0f76306b88945cb5c6e0 (diff) | |
| download | git-6f1ede842351ee6c822b7904a9d55a6720992aa8.tar.gz git-6f1ede842351ee6c822b7904a9d55a6720992aa8.tar.xz | |
Merge branch 'jx/i18n-more-marking'
* 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 eba1377eb..470b4a4e8 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; } |