git-merge: add support for --commit and --no-squash
[git] / t / t5100 / patch0007