[PATCHv2 0/5] D/F conflict fixes

This patch series fixes a number of spurious directory/file conflicts
and associated bugs appearing in cherry-pick, rebase, merge, and
fast-import.  It includes testsuite fixes for currently known failures
in both t6020-merge-df.sh and t6035-merge-dir-to-symlink.sh.

The right person to review the changes other than the simple
fast-import one is probably Dscho; in his absence, the next best as
far as I can tell is probably Junio or perhaps Shawn.  I hate to
overwork them even more, so if anyone else has some time to take a
look or even do some simple testing, it'd be much appreciated.  Shawn
is a natural choice for reviewing the (fairly trivial) fast-import
change.

Changes since the previous submission:
  * Significantly extended, clarified, or otherwise modified several
    of the commit messages
  * Rebased the series on top of maint (sorry about submitting
    relative to next!)
  * Added Alexander's signoff on his testcase
  * Moved the new rename+D/F conflict testcase to a different file
    since the testcase uses cherry-pick rather than merge.

Alexander Gladysh (1):
      Add a rename + D/F conflict testcase

Elijah Newren (4):
      Add additional testcases for D/F conflicts
      merge-recursive: Fix D/F conflicts
      merge_recursive: Fix renames across paths below D/F conflicts
      fast-import: Fix minor data-loss issue with directories becoming symlinks

 fast-import.c                   |    5 ++
 merge-recursive.c               |  106 ++++++++++++++++++++++++++++++++-------
 t/t3508-cherry-pick-merge-df.sh |   37 ++++++++++++++
 t/t6020-merge-df.sh             |    2 +-
 t/t6035-merge-dir-to-symlink.sh |   37 +++++++++++++-
 t/t9350-fast-export.sh          |   24 +++++++++
 6 files changed, 190 insertions(+), 21 deletions(-)