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

Posted to commits@subversion.apache.org by ne...@apache.org on 2010/08/12 16:15:11 UTC

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

Author: neels
Date: Thu Aug 12 14:15:11 2010
New Revision: 984797

URL: http://svn.apache.org/viewvc?rev=984797&view=rev
Log:
* subversion/include/svn_client.h (svn_client_resolved): Tweak comment.

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=984797&r1=984796&r2=984797&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Aug 12 14:15:11 2010
@@ -3506,7 +3506,8 @@ svn_client_revert(const apr_array_header
  * resolution support.
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
- * Use svn_client_resolve() instead.
+ * Use svn_client_resolve() with @a conflict_choice == @c
+ * svn_wc_conflict_choose_merged instead.
  */
 SVN_DEPRECATED
 svn_error_t *