t / t5100 / msg0015--no-inbody-headerson commit rerere: teach rerere to handle nested conflicts (4af3220)
   1From: bogosity
   2  - a list
   3  - of stuff