Make a very slight simplification in tree-conflict test code.
Make a very slight simplification in tree-conflict test code.

* subversion/tests/cmdline/tree_conflict_tests.py
  (ensure_tree_conflict): Use plain text matching instead of regex matching.

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