From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 Jan 2007 20:03:53 +0000 (-0800)
Subject: Merge branch 'sp/merge' (early part)
X-Git-Tag: v1.5.0-rc2~103
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6de33478affbf252066cc5863add213ca5cdc13c;p=git.git

Merge branch 'sp/merge' (early part)

* 'sp/merge' (early part):
  Improve merge performance by avoiding in-index merges.
---

6de33478affbf252066cc5863add213ca5cdc13c