t / t4013 / diff.diff-tree_masteron commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1$ git diff-tree master
   2$