diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-31 16:41:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-31 16:41:52 (GMT) |
| commit | 5fe1484a9b89e22f14d94d5b050c39db7ad65c81 (patch) | |
| tree | dc63d0ad35083533b24e889f99e4cfe13844e043 /t/t3404-rebase-interactive.sh | |
| parent | 3b2d763db07f251e424d7f940938d9df1e1d4d09 (diff) | |
| parent | 55653a689e17cfa896aa0454e751a9002b519f4b (diff) | |
| download | git-5fe1484a9b89e22f14d94d5b050c39db7ad65c81.zip git-5fe1484a9b89e22f14d94d5b050c39db7ad65c81.tar.gz git-5fe1484a9b89e22f14d94d5b050c39db7ad65c81.tar.bz2 | |
Merge branch 'jx/i18n-1.7.11'
Add i18n support for scripted Porcelains, and mark strings in
merge(-recursive), am, and rebase for i18n.
* jx/i18n-1.7.11:
i18n: merge-recursive: mark strings for translation
Remove dead code which contains bad gettext block
i18n: am: mark more strings for translation
rebase: remove obsolete and unused LONG_USAGE which breaks xgettext
i18n: Rewrite gettext messages start with dash
i18n: rebase: mark messages for translation
i18n: New keywords for xgettext extraction from sh
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3f75d32..7304b66 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -858,7 +858,7 @@ test_expect_success 'rebase -ix with --autosquash' ' test_expect_success 'rebase --exec without -i shows error message' ' git reset --hard execute && test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual && - echo "--exec option must be used with --interactive option" >expected && + echo "The --exec option must be used with the --interactive option" >expected && test_i18ncmp expected actual ' |