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

Posted to commits@subversion.apache.org by st...@apache.org on 2015/07/30 19:03:24 UTC

svn commit: r1693457 - /subversion/trunk/subversion/include/svn_client.h

Author: stsp
Date: Thu Jul 30 17:03:24 2015
New Revision: 1693457

URL: http://svn.apache.org/r1693457
Log:
* subversion/include/svn_client.h
  (svn_client_conflict_get_conflicted): Fix typo in docstring.

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

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1693457&r1=1693456&r2=1693457&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Jul 30 17:03:24 2015
@@ -4416,7 +4416,7 @@ svn_client_conflict_from_wc_description2
 * the caller is not interested in the status of a particular type.
 *
 * The returned @a *props_conflicted array is allocated in @a result_pool.
-* It contains the names of conflicted properties. If no property conflit
+* It contains the names of conflicted properties. If no property conflict
 * exists, the array will contain no elements.
 *
 * @since New in 1.10.