summaryrefslogtreecommitdiff
path: root/merge-tree.c