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

4
t/t7600-merge.sh
View File

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