Combine resolve_tests.py and resolved_tests.py, as 'svn resolved' is
functionally just a variant of 'svn resolve' and they are not large (only
three tests each) and already at least one test was in the 'wrong' file
according to that trivial segregation.

* subversion/tests/cmdline/resolve_tests.py
  (resolved_on_wc_root, resolved_on_deleted_item, theirs_conflict_in_subdir):
    Move from ...

* subversion/tests/cmdline/resolved_tests.py
  ... here, and delete this file.

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