diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-14 14:36:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-14 14:36:14 -0700 |
| commit | c9ea118e75b1b8f8cc744e372576b4cf63594e0d (patch) | |
| tree | 2c18202d883a99675b6727d34f64b0f6d02192b5 /t/t7600-merge.sh | |
| parent | cc6658e7b4baad88ea30b0a1c8d4857f6253c2b0 (diff) | |
| download | git-c9ea118e75b1b8f8cc744e372576b4cf63594e0d.tar.gz | |
i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 87d5d788cb..e84e822219 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -495,10 +495,10 @@ test_expect_success 'merge fast-forward in a dirty tree' ' test_debug 'git log --graph --decorate --oneline --all' -test_expect_success C_LOCALE_OUTPUT 'in-index merge' ' +test_expect_success 'in-index merge' ' git reset --hard c0 && git merge --no-ff -s resolve c1 >out && - grep "Wonderful." out && + test_i18ngrep "Wonderful." out && verify_parents $c0 $c1 ' |