From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Aug 2009 18:34:24 +0000 (-0700)
Subject: Merge branch 'jc/maint-merge-recursive-fix' into maint
X-Git-Tag: v1.6.4.1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c;p=git.git

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

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

3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c