t / t5100 / msg0017on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1New content here
   2