From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Jun 2006 21:35:33 +0000 (-0700)
Subject: Merge branch 'ml/cvsimport'
X-Git-Tag: v1.4.1-rc2~20
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9f9817e34a2cdead809854a0b3b2c93969663402;hp=-c;p=git.git

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
---

9f9817e34a2cdead809854a0b3b2c93969663402