aboutsummaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-06 14:45:45 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-06 14:45:45 -0700
commit21b4ae74b4c6094f5aabcafe4fc01bd2d8cfd054 (patch)
treee24a78bcd16c5374c1e2abe0f0d7ed40d5f44e7a /xdiff
parent8429f2b42d04a0598079c847c39d45d777613939 (diff)
parent9e220fedf81cace5172ed86014e9ad425f7f3250 (diff)
downloadgit-21b4ae74b4c6094f5aabcafe4fc01bd2d8cfd054.tar.gz
git-21b4ae74b4c6094f5aabcafe4fc01bd2d8cfd054.tar.xz
Merge branch 'ls/p4-lfs-test-fix-2.7.0'
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 'xdiff')
0 files changed, 0 insertions, 0 deletions