t / t5100 / msg0018on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1a commit message
   2