git-merge: refactor option parsing
[git] / t / t5100 / patch0007