Merge branch 'js/merge-already-up-to-date-message-reword'
[git] / t / t5100 / msg0016
1 and some content
2