summaryrefslogtreecommitdiff
path: root/merge-index.c