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/t7607-merge-overwrite.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/t7607-merge-overwrite.sh')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 7 |
1 files changed, 2 insertions, 5 deletions
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.' ' |