t / t5100 / msg0016on commit merge-recursive: options to ignore whitespace changes (4e5dd04)
   1and some content
   2