kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ævar Arnfjörð Bjarmason 2011-02-22 23:42:01 +00:00 committed by Junio C Hamano
parent 2ceb61e0a0
commit 2ce216eeda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3030-merge-recursive.sh
View File

@ -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" &&