Author: stsp Revision: 1727405 Modified property: svn:log Modified: svn:log at Thu Jan 28 16:59:03 2016 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Jan 28 16:59:03 2016 @@ -1,3 +1,3 @@ * subversion/libsvn_client/resolved.c (svn_client_conflict_get_conflicted): Satisfy docstring's requirement and - return an empty array if there are no conflict properties. + return an empty array if there are no conflicted properties.