summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 20:39:02 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 20:39:03 +0900
commit9da9fff14d82e1ce055b664f276a5a96d2f5e946 (patch)
tree0c0affd245c2d30fbb7b55f8d415c48fb87cc03c /merge.c
parentMerge branch 'tz/build-tech-midx-doc' (diff)
parentclone: fix colliding file detection on APFS (diff)
downloadtgif-9da9fff14d82e1ce055b664f276a5a96d2f5e946.tar.xz
Merge branch 'nd/clone-case-smashing-warning'
Recently added check for case smashing filesystems did not correctly utilize the cached stat information, leading to false breakage detected by our test suite, which has been corrected. * nd/clone-case-smashing-warning: clone: fix colliding file detection on APFS
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions