t / t5100 / msg0017on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1New content here
   2