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)
commit8d707b62930cabd45f063c3be568fe80b5c829a9
tree02998559f9953a1ad91dffe0e301779d2ce45d34
parentd3c4519a726f1cfcb0c96ba71e4f3208b47fed88
parent8a5f2eac5271ba1efed353c0c0a992d6471a8d05
Merge branch 'jc/cvsimport' into next

* jc/cvsimport:
  cvsimport: honor -i and non -i upon subsequent imports