diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-15 01:36:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-15 01:36:14 +0400 |
| commit | c9ea118e75b1b8f8cc744e372576b4cf63594e0d (patch) | |
| tree | 2c18202d883a99675b6727d34f64b0f6d02192b5 /t/t7611-merge-abort.sh | |
| parent | cc6658e7b4baad88ea30b0a1c8d4857f6253c2b0 (diff) | |
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/t7611-merge-abort.sh')
| -rwxr-xr-x | t/t7611-merge-abort.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh index cdb3f444cd..7b4798e8e4 100755 --- a/t/t7611-merge-abort.sh +++ b/t/t7611-merge-abort.sh @@ -46,11 +46,8 @@ test_expect_success 'setup' ' pre_merge_head="$(git rev-parse HEAD)" test_expect_success 'fails without MERGE_HEAD (unstarted merge)' ' - test_must_fail git merge --abort 2>output -' - -test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (unstarted merge): fatal output' ' - grep -q MERGE_HEAD output + test_must_fail git merge --abort 2>output && + test_i18ngrep MERGE_HEAD output ' test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' ' @@ -63,11 +60,8 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' ' test ! -f .git/MERGE_HEAD && # Merge successfully completed post_merge_head="$(git rev-parse HEAD)" && - test_must_fail git merge --abort 2>output -' - -test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (completed merge): output' ' - grep -q MERGE_HEAD output + test_must_fail git merge --abort 2>output && + test_i18ngrep MERGE_HEAD output ' test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' ' |