Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
[git] / t / t5100 / msg0006
1 Here is a patch from A U Thor.
2