t / t5100 / msg0006on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1Here is a patch from A U Thor.
   2