summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Eric Wong <e@80x24.org>2021-12-07 18:38:10 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-07 15:18:35 -0800
commit2c68f577fc8a400f4d354f4700e4809c1bfd6470 (patch)
treeda5158980e4999518393365b8d60c499e988afc2 /Documentation/git-merge.txt
parentGit 2.34.1 (diff)
downloadtgif-2c68f577fc8a400f4d354f4700e4809c1bfd6470.tar.xz
cbtree: remove broken and unused cb_unlink
cb_unlink is broken once a node is no longer self-referential due to subsequent insertions. This is a consequence of an intrusive implementation and I'm not sure if it's easily fixable while retaining our cache-friendly intrusive property (I've tried for several hours in another project). In any case, we're not using cb_unlink anywhere in our codebase, just get rid of it to avoid misleading future readers. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions