From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2009 02:03:43 +0000 (-0700)
Subject: Merge branch 'do/maint-merge-recursive-fix' into maint
X-Git-Tag: v1.6.3.2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5c44cc9ea29b74ed10f5f239791b2c2f9586f197

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

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

5c44cc9ea29b74ed10f5f239791b2c2f9586f197