Tweak test for issue #3174 so it more closely aligns with the actual issue.
Tweak test for issue #3174 so it more closely aligns with the actual issue.

* subversion/tests/cmdline/merge_tests.py
  (merge_chokes_on_renamed_subtrees): Tweak the test so it properly tests
  issue #3174, as it was written it was actually testing issue #3076.

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