t / t5100 / info0008on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1Author: Junio C Hamano
   2Email: junio@kernel.org
   3Subject: another patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5