t / t5100 / info0008on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1Author: Junio C Hamano
   2Email: junio@kernel.org
   3Subject: another patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5