t / t5100 / info0008on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1Author: Junio C Hamano
   2Email: junio@kernel.org
   3Subject: another patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5