* subversion/tests/cmdline/resolve_tests.py    (prop_conflict_resolution): Fix documentation to match code.
* subversion/tests/cmdline/resolve_tests.py  
 (prop_conflict_resolution): Fix documentation to match code.

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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion