Merge branch 'do/maint-merge-recursive-fix' into maint
* do/maint-merge-recursive-fix: merge-recursive: never leave index unmerged while recursing
Junio C Hamano committed
May 25, 2009 at 19:03 UTC
5c44cc9ea29b74ed10f5f239791b2c2f9586f197
No changes.