t / t5100 / msg0015--no-inbody-headerson commit mergetool: honor diff.orderFile (57937f7)
   1From: bogosity
   2  - a list
   3  - of stuff