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