Following up on r1443112, update results on another test that should pass now.

When we encounter a 'local edit' tree conflict, we don't expect the delete
to continue deleting what we have locally.

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (tree_conflicts_on_merge_no_local_ci_5_2): Update expected results.
    Remove XFail marker.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1443140 13f79535-47bb-0310-9956-ffa450edef68