diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:10 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:10 +0900 |
commit | 22dd22dce050f042b3eec165440966186691db42 (patch) | |
tree | b2624031f65634e68ce80d4dbcb2c80db687273a /git-mergetool.sh | |
parent | Merge branch 'sb/userdiff-dts' (diff) | |
parent | fsmonitor: don't fill bitmap with entries to be removed (diff) | |
download | tgif-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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions