t / t5100 / msg0016on commit user-manual.txt: prefer 'merge --abort' over 'reset --hard' (fc991b4)
   1and some content
   2