Merge branch 'ar/merge-recursive'
authorJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:48:28 +0000 (16:48 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:48:28 +0000 (16:48 -0800)
commit141d21b8256ef96bbd693fd35e154787365e26dc
tree28889e621995328e4f2747a8605694ab14456e2b
parentc388761c153bc3e874e75f69ff77430164c038c4
parent8b944b5678efcbbbedfd555e5eef1500dc6074d1
Merge branch 'ar/merge-recursive'

* ar/merge-recursive:
  merge-recursive: do not use on-file index when not needed.
  Speed-up recursive by flushing index only once for all entries