Merge branch 'kb/diff-C-M-synonym'
[git] / t / t5100 / msg0016
1 and some content
2