summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh