From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Sep 2010 00:25:28 +0000 (-0700)
Subject: Merge branch 'en/rename-d-f' into en/merge-recursive
X-Git-Tag: v1.7.4-rc0~101^2~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a1155adc2dde23fd664ad47399379cd0561762af;p=git.git

Merge branch 'en/rename-d-f' into en/merge-recursive

* en/rename-d-f:
  merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
  t3509: Add rename + D/F conflict testcase that recursive strategy fails
---

a1155adc2dde23fd664ad47399379cd0561762af