global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 12:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sc/difftool-skip' into next

Browse Source 
* sc/difftool-skip:
  t7800: avoid arithmetic expansion notation
This commit is contained in:
Junio C Hamano
2011-10-14 15:04:15 -07:00
parent 9445c61126 15a31e7885
commit b91c5812e8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t7800-difftool.sh
View File

@@ -289,7 +289,7 @@ test_expect_success PERL 'setup with 2 files different' '
'
test_expect_success PERL 'say no to the first file' '
diff=$((echo n; echo) | git difftool -x cat branch) &&
diff=$( (echo n; echo) | git difftool -x cat branch ) &&
echo "$diff" | stdin_contains m2 &&
echo "$diff" | stdin_contains br2 &&
@@ -298,7 +298,7 @@ test_expect_success PERL 'say no to the first file' '
'
test_expect_success PERL 'say no to the second file' '
diff=$((echo; echo n) | git difftool -x cat branch) &&
diff=$( (echo; echo n) | git difftool -x cat branch ) &&
echo "$diff" | stdin_contains master &&
echo "$diff" | stdin_contains branch &&