* subversion/tests/cmdline/update_tests.py
  (update_nested_move_text_mod): Resolve conflict, adjust expectations,
   remove XFail.


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