Combine diff_tests 33 with diff_tests 32, now that both tests pass.
Combine diff_tests 33 with diff_tests 32, now that both tests pass.

* subversion/tests/cmdline/diff_tests.py
  (diff_repos_wc_add_with_props): Add test condition from
    diff_repos_wc_add_with_props2.
  (diff_repos_wc_add_with_props2): Remove.
  (test_list): Remove test diff_repos_wc_add_with_props2.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion