t / t5100 / msg0015--no-inbody-headerson commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1From: bogosity
   2  - a list
   3  - of stuff