t / t5100 / info0005on commit merge-file: support -p and -q; fix compile warnings (fbe0b24)
   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