* subversion/tests/cmdline/merge_tests.py   (merge_to_path_with_switched_children): Use two branches in this test,   eliminating the need for contrived svn:mergeinfo propset.
* subversion/tests/cmdline/merge_tests.py
  (merge_to_path_with_switched_children): Use two branches in this test,
  eliminating the need for contrived svn:mergeinfo propset.

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