diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-13 03:33:39 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-14 02:52:47 +0400 |
| commit | b3e1900a740156586b00c62f8fe67aafb1ce346d (patch) | |
| tree | 976e984f358168725e20445169b0746e086511cc /t/t7060-wtstatus.sh | |
| parent | 68b2a0055c9936235fac6559de783f39fb790318 (diff) | |
i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7060-wtstatus.sh')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index b4fcc86a10..da2a1f194c 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -38,7 +38,7 @@ cat >expect <<EOF no changes added to commit (use "git add" and/or "git commit -a") EOF -test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' ' +test_expect_success 'M/D conflict does not segfault' ' mkdir mdconflict && ( cd mdconflict && @@ -50,9 +50,9 @@ test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' ' git commit -m delete && test_must_fail git merge master && test_must_fail git commit --dry-run >../actual && - test_cmp ../expect ../actual && + test_i18ncmp ../expect ../actual && git status >../actual && - test_cmp ../expect ../actual + test_i18ncmp ../expect ../actual ) ' |