t / t5100 / msg0016on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1and some content
   2