On the tree-conflicts branch, make another minor correction to merge test 92, "tree conflicts and obstructions".
On the tree-conflicts branch, make another minor correction to merge test 92,
"tree conflicts and obstructions".

* subversion/tests/cmdline/merge_tests.py
  (tree_conflicts_and_obstructions): Expect 'alpha-moved' on the branch
   to be skipped.


git-svn-id: 080e87057772675a7b26c87dbedb1538c5b5954e@870256 13f79535-47bb-0310-9956-ffa450edef68

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