From: Junio C Hamano <junkio@cox.net>
Date: Fri, 12 Jan 2007 00:48:28 +0000 (-0800)
Subject: Merge branch 'ar/merge-recursive'
X-Git-Tag: v1.5.0-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/141d21b8256ef96bbd693fd35e154787365e26dc

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

141d21b8256ef96bbd693fd35e154787365e26dc