From 5cd3549c58c1981fa87a04bd955b60bef7247b1e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sun, 19 Sep 2010 15:20:50 +0000 Subject: [PATCH] gettextize: git-merge "You have not concluded your merge" messages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- builtin/merge.c | 6 +++--- t/t3030-merge-recursive.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 0571ab38d..595f216e4 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -910,10 +910,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * add/rm ', just 'git commit'. */ if (advice_resolve_conflict) - die("You have not concluded your merge (MERGE_HEAD exists).\n" - "Please, commit your changes before you can merge."); + die(_("You have not concluded your merge (MERGE_HEAD exists).\n" + "Please, commit your changes before you can merge.")); else - die("You have not concluded your merge (MERGE_HEAD exists)."); + die(_("You have not concluded your merge (MERGE_HEAD exists).")); } resolve_undo_clear(); diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index e66e550b2..b21626842 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -299,7 +299,7 @@ test_expect_success 'merge-recursive result' ' ' -test_expect_success 'fail if the index has unresolved entries' ' +test_expect_success NO_GETTEXT_POISON 'fail if the index has unresolved entries' ' rm -fr [abcd] && git checkout -f "$c1" && -- 2.30.2