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