diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-23 00:42:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-10 08:52:55 +0100 |
| commit | 2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a (patch) | |
| tree | 95d0250ece801e4b66c44bd7583f8c693114aa0a /t | |
| parent | i18n: git-merge "Updating %s..%s" message (diff) | |
| download | git-2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a.tar.xz git-2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a.zip | |
i18n: git-merge "You have not concluded your merge" messages
Gettextize the "You have not concluded your merge messages. A test in
t3030-merge-recursive.sh explicitly checked for this message. Change
it to skip the test under GETTEXT_POISON=YesPlease.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 34794f8a70..806fdccce1 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -312,7 +312,7 @@ test_expect_success 'merge-recursive result' ' ' -test_expect_success 'fail if the index has unresolved entries' ' +test_expect_success C_LOCALE_OUTPUT 'fail if the index has unresolved entries' ' rm -fr [abcd] && git checkout -f "$c1" && |