* subversion/tests/cmdline/tree_conflict_tests.py   (actual_only_node_behaviour): Following up on r1302450, make error regex     less strict.
* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Following up on r1302450, make error regex
    less strict.

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