summaryrefslogtreecommitdiff
path: root/git-merge.sh