t / t5100 / info0013on commit Merge branch 'da/mergetool-delete-delete-conflict' into maint (517736f)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: a patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5