Merge branch 'jc/cvsimport' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 17 Mar 2006 22:11:17 +0000 (14:11 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 17 Mar 2006 22:11:17 +0000 (14:11 -0800)
* jc/cvsimport:
  cvsimport: honor -i and non -i upon subsequent imports


Trivial merge