t / t5100 / info0017on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: A E I O U
   4Date: Mon, 17 Sep 2012 14:23:44 -0700
   5