Remove XFail from a test by resolving with --accept=working rather
than --accept=theirs-conflict.

* subversion/tests/cmdline/update_tests.py
  (break_moved_replaced_dir): Resolve using working, expect conflict to
   be resolved, remove XFail marking.


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