merge: Honor prepare-commit-msg return code