From: Junio C Hamano 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.tokkee.org/?a=commitdiff_plain;h=5c44cc9ea29b74ed10f5f239791b2c2f9586f197;p=git.git Merge branch 'do/maint-merge-recursive-fix' into maint * do/maint-merge-recursive-fix: merge-recursive: never leave index unmerged while recursing --- 5c44cc9ea29b74ed10f5f239791b2c2f9586f197