t / t5100 / info0014--scissorson commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1Author: Junio C Hamano
   2Email: gitster@pobox.com
   3Subject: Teach mailinfo to ignore everything before -- >8 -- mark
   4Date: Thu, 20 Aug 2009 17:18:22 -0700
   5