t / t5100 / msg0016--no-inbody-headerson commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1Date: bogus
   2
   3and some content
   4