From: Junio C Hamano <junkio@cox.net>
Date: Fri, 17 Mar 2006 22:11:17 +0000 (-0800)
Subject: Merge branch 'jc/cvsimport' into next
X-Git-Tag: v1.3.0-rc1~23
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=8d707b62930cabd45f063c3be568fe80b5c829a9

Merge branch 'jc/cvsimport' into next

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

8d707b62930cabd45f063c3be568fe80b5c829a9