* subversion/tests/cmdline/merge_authz_tests.py   (mergeinfo_and_skipped_paths): Tweak tree conflict expectations so it passes.
* subversion/tests/cmdline/merge_authz_tests.py
  (mergeinfo_and_skipped_paths): Tweak tree conflict expectations so it passes.

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