git-merge: exclude unnecessary options from OPTIONS_SPEC