* subversion/tests/cmdline/merge_tests.py   (avoid_reflected_revs): Tweak this XFAIL test to not expect conflicts,   since the ideal result would be a clean merge. That expectation appears   to have been set in error when I merged the tree-conflicts branch to   trunk in r873156. Also improve the comments.
* subversion/tests/cmdline/merge_tests.py
  (avoid_reflected_revs): Tweak this XFAIL test to not expect conflicts,
  since the ideal result would be a clean merge. That expectation appears
  to have been set in error when I merged the tree-conflicts branch to
  trunk in r873156. Also improve the comments.

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