t / t5100 / info0008on commit Merge branch 'da/mergetool-delete-delete-conflict' into maint (517736f)
   1Author: Junio C Hamano
   2Email: junio@kernel.org
   3Subject: another patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5