Merge branch 'jc/maint-merge-recursive-fix' into maint
commit3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000 (21 11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000 (21 11:34 -0700)
tree91ce5e5495f5d022bebd77ea41bd51970e8ec3db
parentd3ebb174ea0881ff1d801174d18271bfc50245e3
parentc94736a27f89bfc268aed0de7264deecdc136a58
Merge branch 'jc/maint-merge-recursive-fix' into maint

* jc/maint-merge-recursive-fix:
  merge-recursive: don't segfault while handling rename clashes
merge-recursive.c