t / t5100 / msg0013on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1