summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Đoàn Trần Công Danh <congdanhqx@gmail.com>2020-03-25 22:06:17 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-25 08:54:37 -0700
commitff0dab331e2740f7e565e1539bd5848657766f6f (patch)
tree39ddf1e574fa30d528919c9a91dbb2081cf741eb /Documentation/git-merge-file.txt
parentt5003: drop the subshell in test_lazy_prereq (diff)
downloadtgif-ff0dab331e2740f7e565e1539bd5848657766f6f.tar.xz
t5003: skip conversion test if unzip -a is unavailable
Alpine Linux's default unzip(1) doesn't support `-a`. Skip those tests on that platform. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions