From c9ea118e75b1b8f8cc744e372576b4cf63594e0d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 14 Apr 2011 14:36:14 -0700 Subject: i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 Signed-off-by: Junio C Hamano --- t/t7607-merge-overwrite.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 't/t7607-merge-overwrite.sh') diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index ef84f04102..72a8731d5e 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -150,11 +150,8 @@ test_expect_success 'will not overwrite untracked file on unborn branch' ' git rm -fr . && git checkout --orphan new && cp important c0.c && - test_must_fail git merge c0 2>out -' - -test_expect_success C_LOCALE_OUTPUT 'will not overwrite untracked file on unborn branch: output' ' - test_cmp out expect + test_must_fail git merge c0 2>out && + test_i18ncmp out expect ' test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' ' -- cgit v1.2.3