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/31 13:47:06 UTC

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

Author: stsp
Date: Fri Jul 31 11:47:06 2015
New Revision: 1693574

URL: http://svn.apache.org/r1693574
Log:
* subversion/include/svn_client.h
  (svn_client_conflict_t, svn_client_conflict_option_t): Add docstrings.

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=1693574&r1=1693573&r2=1693574&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri Jul 31 11:47:06 2015
@@ -4361,8 +4361,18 @@ svn_client_revert(const apr_array_header
  * @{
  */
 
+/**
+ * An opaque type which represents a conflicted node in the working copy.
+ *
+ * @since New in 1.10.
+ */
 typedef struct svn_client_conflict_t svn_client_conflict_t;
 
+/**
+ * An opaque type which represents a resolution option for a conflict.
+ *
+ * @since New in 1.10.
+ */
 typedef struct svn_client_conflict_option_t svn_client_conflict_option_t;
 
 /**