git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options