global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-14 02:40:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #773 from jeffhostetler/vs2015

Browse Source 
Build with VS2015
This commit is contained in:
Johannes Schindelin
2017-01-10 23:37:31 +01:00
parent 7422f3a3dd a9858eb3ba
commit f52111fdf1
17 changed files with 827 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7800-difftool.sh
View File

@@ -320,7 +320,7 @@ test_expect_success PERL 'difftool --extcmd cat arg1' '
test_expect_success PERL 'difftool --extcmd cat arg2' '
echo branch >expect &&
git difftool --no-prompt \
--extcmd sh\ -c\ \"cat\ \$2\" branch >actual &&
--extcmd sh\ -c\ \"cat\ \\\"\$2\\\"\" branch >actual &&
test_cmp expect actual
'