t / t5100 / msg0016on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1and some content
   2