On the 'move-tracking-2' branch: Update test expectations, following r1713718.
On the 'move-tracking-2' branch: Update test expectations, following r1713718.

* subversion/tests/cmdline/svnmover_tests.py
  (tree_conflict_detect): Expect the commit to raise an error, not the merge.

git-svn-id: 486ec3464084f62cfe8608152673c827b947faa2@1713808 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion