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.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@870516 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion