aboutsummaryrefslogtreecommitdiff
path: root/t/t6033-merge-crlf.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:08 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:08 -0700
commit7ab6da3c40420c297016c0a62bece1573d0589ce (patch)
tree94ee06a270ec02405914a4bd6bcf91595422fb4d /t/t6033-merge-crlf.sh
parentf735a50ffdf0e1734438f0c0e6d70c4a81eea09e (diff)
parent9e220fedf81cace5172ed86014e9ad425f7f3250 (diff)
downloadgit-7ab6da3c40420c297016c0a62bece1573d0589ce.tar.gz
git-7ab6da3c40420c297016c0a62bece1573d0589ce.tar.xz
Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD
Fix a broken test. * ls/p4-lfs-test-fix-2.7.0: t9824: fix wrong reference value t9824: fix broken &&-chain in a subshell
Diffstat (limited to 't/t6033-merge-crlf.sh')
0 files changed, 0 insertions, 0 deletions