summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-28 20:18:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-28 20:18:05 (GMT)
commit1d07640b65d67d4a0fc657b5d09c3933e6e41ea6 (patch)
tree25e3d9bb7d3c67c79c9fe5f59cdf755e49895d2f /t/t6023-merge-file.sh
parent7f554a4f694dc5e9a3cb42887546a121ff9d2b93 (diff)
parentade15525987a2e108fe6b6dd1a2ba4d963d64f13 (diff)
downloadgit-1d07640b65d67d4a0fc657b5d09c3933e6e41ea6.zip
git-1d07640b65d67d4a0fc657b5d09c3933e6e41ea6.tar.gz
git-1d07640b65d67d4a0fc657b5d09c3933e6e41ea6.tar.bz2
Merge branch 'ps/t0000-output-directory-fix'
"TEST_OUTPUT_DIRECTORY=there make test" failed to work, which has been corrected. * ps/t0000-output-directory-fix: t0000: fix test if run with TEST_OUTPUT_DIRECTORY
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions