Tweak a regexp so that a test passes against 1.4.x svnserve/FSFS.
Tweak a regexp so that a test passes against 1.4.x svnserve/FSFS.

* subversion/tests/cmdline/prop_tests.py
  (commit_conflict_dirprops): Allow an 'o' to be uppercase.

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