t / t5100 / msg0015--no-inbody-headerson commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1From: bogosity
   2  - a list
   3  - of stuff