[PATCH 0/3] Fix resolvable rename + D/F conflict testcases

This fixes an issue reported by Nick, as well as a closely related
issue in the handling of rename + directory/file conflicts,
particularly where a file on one side of the rename is a directory
name on the other side of the merge.

Elijah Newren (3):
  t3509: Add rename + D/F conflict testcases that recursive strategy
    fails
  merge-recursive: Small code cleanup
  merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

 merge-recursive.c               |   50 ++++++++++++++++-------------
 t/t3509-cherry-pick-merge-df.sh |   66 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 22 deletions(-)

-- 
1.7.3.rc0.170.g5cfb0.dirty