summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-23 14:43:10 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-23 14:43:10 +0900
commit22dd22dce050f042b3eec165440966186691db42 (patch)
treeb2624031f65634e68ce80d4dbcb2c80db687273a /ll-merge.c
parentMerge branch 'sb/userdiff-dts' (diff)
parentfsmonitor: don't fill bitmap with entries to be removed (diff)
downloadtgif-22dd22dce050f042b3eec165440966186691db42.tar.xz
Merge branch 'wb/fsmonitor-bitmap-fix'
A segfault fix. * wb/fsmonitor-bitmap-fix: fsmonitor: don't fill bitmap with entries to be removed
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions