summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c