summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh