git-merge: fix faulty SQUASH_MSG