From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:39:50 +0000 (-0700)
Subject: Merge branch 'do/maint-merge-recursive-fix'
X-Git-Tag: v1.6.4-rc0~138
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d32643c0ff6d74b967b65e867f1f99dba840836e;p=git.git

Merge branch 'do/maint-merge-recursive-fix'

* do/maint-merge-recursive-fix:
  merge-recursive: never leave index unmerged while recursing
---

d32643c0ff6d74b967b65e867f1f99dba840836e