t / t5100 / emptyon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1