Andrew's git / gitweb.git / t/t5100/info0008
?
t / t5100 / info0008on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Author: Junio C Hamano
   2Email: junio@kernel.org
   3Subject: another patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5