subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1780061 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Tue, 24 Jan 2017 10:56:07 GMT
Author: stsp
Date: Tue Jan 24 10:56:07 2017
New Revision: 1780061

URL: http://svn.apache.org/viewvc?rev=1780061&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (find_option_by_builtin): Fix docstring.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1780061&r1=1780060&r2=1780061&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Jan 24 10:56:07 2017
@@ -533,8 +533,8 @@ find_option(const apr_array_header_t *op
   return NULL;
 }
 
-/* Return a pointer to the option description in OPTIONS matching the
- * conflict option ID CHOICE. @a out will be set to NULL if the
+/* Return a pointer to the client_option_t in OPTIONS matching the ID of
+ * conflict option BUILTIN_OPTION. @a out will be set to NULL if the
  * option was not found. */
 static svn_error_t *
 find_option_by_builtin(client_option_t **out,



Mime
View raw message