t / t5100 / info0005on commit git-rebase--interactive.sh: Make 3-way merge strategies work for -p. (f91333d)
   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