t / t5100 / msg0006on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1Here is a patch from A U Thor.
   2