Adjust the regression test for issue 4037, incoming move with local
move, to PASS.

* subversion/tests/cmdline/update_tests.py
  (update_moved_dir_file_move): Adjust expectations, resolve tree-conflict
   by following the local move, remove XFAIL.


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