History git-merge-resolve.sh