t / t5100 / msg0009on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1This is to fix diff-format documentation.
   2