mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-04-14 14:36:14 -07:00
parent cc6658e7b4
commit c9ea118e75
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/t7607-merge-overwrite.sh
View File

@ -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.' '