t / t5100 / patch0008on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1