t / t5100 / msg0009on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1This is to fix diff-format documentation.
   2