From: Elijah Newren <newren@gmail.com>
Date: Wed, 8 Sep 2010 06:40:40 +0000 (-0600)
Subject: t3509: Add rename + D/F conflict testcase that recursive strategy fails
X-Git-Tag: v1.7.4-rc0~101^2~39^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/56bfd762e5e602031eab8ce881b8ab0c50d2cfcc?ds=inline;hp=56bfd762e5e602031eab8ce881b8ab0c50d2cfcc

t3509: Add rename + D/F conflict testcase that recursive strategy fails

When one side of a file rename matches a directory name on the other side,
the recursive merge strategy will fail.  This is true even if the merge is
trivially resolvable.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---