completion: add missing options for git-merge
[git] / t / t5100 / msg0016
1 and some content
2