git-merge: refactor option parsing