Andrew's git / gitweb.git / t/t5100/info0009
?
t / t5100 / info0009on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Author: F U Bar
   2Email: f.u.bar@example.com
   3Subject: updates
   4Date: Mon, 17 Sep 2001 00:00:00 +0900
   5