Merge branch 'jc/maint-merge-recursive-fix' into maint
* jc/maint-merge-recursive-fix: merge-recursive: don't segfault while handling rename clashes
Junio C Hamano committed
Aug 21, 2009 at 11:34 UTC
3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c
No changes.