git-p4: add submit --conflict option and config varaiable
[git] / t / t5100 / msg0016
1 and some content
2