completion: add missing options for git-merge
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff