Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
[git] / t / t5100 / msg0016
1 and some content
2