git-merge-resolve.sh 956 Bytes