Merge branch 'ml/cvsimport'
commit9f9817e34a2cdead809854a0b3b2c93969663402
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:35:33 +0000 (26 14:35 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:35:33 +0000 (26 14:35 -0700)
tree75138a3b7a2f643211f1a36e2e64541eda86199e
parent2cc06a0500b4b69e8563f76c42306e36b1f0aabf
parent061303f0b50a648db8e0af23791fc56181f6bf93
Merge branch 'ml/cvsimport'

* ml/cvsimport:
  cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
  cvsimport: setup indexes correctly for ancestors and incremental imports