t / t5100 / msg0016on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1and some content
   2