* subversion/libsvn_wc/diff_local.c
  (file_diff): Don't overwrite the already obtained correct
    original_repos_relpath with the version from the op-root.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1434414 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/diff_tests.py
  (diff_git_format_wc_wc_dir_mv): Remove XFail, fix error in the target
    paths that made the test still fail after r1434414.
  (test_list): Move diff_get_format_wc_wc_dir_mv to the end to avoid
    renumbering tests.


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