summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff3
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:54:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:54:23 -0800
commit883326077a1995a5ea122c298ff47fcd85782c49 (patch)
tree066bf02abfb3f7b706b59ad991fa0915e8c864d8 /mergetools/gvimdiff3
parentMerge branch 'pk/status-of-uncloned-submodule' (diff)
parentnotes.c: fix off-by-one error when decreasing notes fanout (diff)
downloadtgif-883326077a1995a5ea122c298ff47fcd85782c49.tar.xz
Merge branch 'jh/notes-fanout-fix'
The code to automatically shrink the fan-out in the notes tree had an off-by-one bug, which has been killed. * jh/notes-fanout-fix: notes.c: fix off-by-one error when decreasing notes fanout t3305: check notes fanout more carefully and robustly
Diffstat (limited to 'mergetools/gvimdiff3')
0 files changed, 0 insertions, 0 deletions