| commit | 6f1ede842351ee6c822b7904a9d55a6720992aa8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 7 Feb 2012 20:56:54 +0000 (7 12:56 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 7 Feb 2012 20:56:54 +0000 (7 12:56 -0800) | ||
| tree | 90a696c02173726c33049f606e83060a5ff9898a | treesnapshot (tar.gz zip) |
| parent | 12b681c3d2306fefa949c2e04d36e4f888917507 | commitdiff |
| parent | 8a5b749428d39a0e85fb0f76306b88945cb5c6e0 | commitdiff |
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
* jx/i18n-more-marking:
i18n: format_tracking_info "Your branch is behind" message
i18n: git-commit whence_s "merge/cherry-pick" message