From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Aug 2009 05:17:01 +0000 (-0700)
Subject: Merge branch 'jc/maint-merge-recursive-fix'
X-Git-Tag: v1.6.5-rc0~80
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14468ab45bae83ad300f17f41fe8fd555329ee5e;p=git.git

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

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

14468ab45bae83ad300f17f41fe8fd555329ee5e