t / t5100 / info0008on commit t6036: add a failed conflict detection case: regular files, different modes (5d1daf3)
   1Author: Junio C Hamano
   2Email: junio@kernel.org
   3Subject: another patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5