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

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1598028 13f79535-47bb-0310-9956-ffa450edef68