t / t3900 / UTF-16.txton commit rerere: teach rerere to handle nested conflicts (4af3220)
   1