t / t5100 / msg0015--no-inbody-headerson commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1From: bogosity
   2  - a list
   3  - of stuff