* subversion/tests/cmdline/update_tests.py
  (break_moved_dir_edited_leaf_del): New XFAIL test for resolving a local move
   tree conflict with --accept=theirs-conflict.


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