summaryrefslogtreecommitdiff
path: root/t/t3413-rebase-hook.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:01 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-09 23:52:55 -0800
commit2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a (patch)
tree95d0250ece801e4b66c44bd7583f8c693114aa0a /t/t3413-rebase-hook.sh
parenti18n: git-merge "Updating %s..%s" message (diff)
downloadtgif-2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a.tar.xz
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/t3413-rebase-hook.sh')
0 files changed, 0 insertions, 0 deletions