[PATCHv2 0/2] Fix resolvable rename + D/F conflict testcases

This fixes an issue reported by Nick (no lastname given) on the mailing list, as well as a closely related issue in the handling of rename + directory/file conflicts, namely where a filename on one side of the rename is a directory name on the other side of the merge.

Change since v1:
  * Split unrelated 2/3 patch out into a separate submission

Elijah Newren (2):
  t3509: Add rename + D/F conflict testcase that recursive strategy
    fails
  merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

 merge-recursive.c               |   16 +++++-----
 t/t3509-cherry-pick-merge-df.sh |   66 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 8 deletions(-)