Code

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


Trivial merge