New merge test for issue #3174 'Merge algorithm chokes on subtrees needing special attention that have been renamed'
New merge test for issue #3174 'Merge algorithm chokes on subtrees needing
special attention that have been renamed'

* subversion/tests/cmdline/merge_tests.py
  (merge_chokes_on_renamed_subtrees): New.
  (test_list): Add merge_chokes_on_renamed_subtrees, mark as XFail.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion