t / t5100 / msg0016on commit Fix a formatting error in git-merge.txt (af77aee)
   1and some content
   2