Andrew's git / gitweb.git / t/t5100/info0005
?
t / t5100 / info0005on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Author: David Kågedal
   2Email: davidk@lysator.liu.se
   3Subject: Fixed two bugs in git-cvsimport-script.
   4Date: Mon, 15 Aug 2005 20:18:25 +0200
   5