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

[st...@apache.org]

Author: stsp
Date: Wed Jun 24 12:04:08 2015
New Revision: 1687244

URL: http://svn.apache.org/r1687244
Log:
* subversion/include/svn_client.h
  (svn_client_conflict_prop_get_propvals): Document how to generate diffs
   and merged versions of property values.

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=1687244&r1=1687243&r2=1687244&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Jun 24 12:04:08 2015
@@ -4439,7 +4439,11 @@ svn_client_conflict_prop_get_propname(
  * Return the set of property values involved in the property conflict
  * described by @a conflict. If a property value is unavailable the
  * corresponding output argument is set to @c NULL.
- * 
+ *  
+ * A 3-way diff of these property values can be generated with
+ * svn_diff_mem_string_diff3(). A merged version with conflict
+ * markers can be generated with svn_diff_mem_string_output_merge3().
+ *
  * @since New in 1.10.
  */
 svn_error_t *