You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2011/08/24 15:13:06 UTC

svn commit: r1161084 - /subversion/trunk/subversion/include/svn_wc.h

Author: danielsh
Date: Wed Aug 24 13:13:05 2011
New Revision: 1161084

URL: http://svn.apache.org/viewvc?rev=1161084&view=rev
Log:
* subversion/include/svn_wc.h
  (svn_wc_conflict_resolver_func2_t): Clarify the language of the doc string.

Modified:
    subversion/trunk/subversion/include/svn_wc.h

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1161084&r1=1161083&r2=1161084&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Wed Aug 24 13:13:05 2011
@@ -2060,7 +2060,7 @@ svn_wc_create_conflict_result(svn_wc_con
  *
  * The values #svn_wc_conflict_choose_mine_conflict and
  * #svn_wc_conflict_choose_theirs_conflict are not legal for conflicts
- * in binary files or properties.
+ * in binary files or binary properties.
  *
  * Implementations of this callback are free to present the conflict
  * using any user interface.  This may include simple contextual