t / t5100 / msg0015on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1  - a list
   2  - of stuff