t / t5100 / msg0008on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4