summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:39 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:39 -0800
commitaec3b2e24f83e8b5985257b8270029c968e980b3 (patch)
treedb6a2f026c949d3d8b1f3a3c89c6b75e54ebeca3 /git-difftool--helper.sh
parentMerge branch 'sg/skip-skipped-prereq' (diff)
parentfsmonitor: do not compare bitmap size with size of split index (diff)
downloadtgif-aec3b2e24f83e8b5985257b8270029c968e980b3.tar.xz
Merge branch 'jc/fsmonitor-sanity-fix'
Remove an incorrect BUG() that should not trigger. * jc/fsmonitor-sanity-fix: fsmonitor: do not compare bitmap size with size of split index
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions