t / t5100 / info0005on commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   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