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

Posted to commits@subversion.apache.org by ju...@apache.org on 2012/12/06 13:46:13 UTC

svn commit: r1417816 - /subversion/trunk/subversion/libsvn_wc/conflicts.h

Author: julianfoad
Date: Thu Dec  6 12:46:12 2012
New Revision: 1417816

URL: http://svn.apache.org/viewvc?rev=1417816&view=rev
Log:
* subversion/libsvn_wc/conflicts.h
  (svn_wc__conflict_read_info): Tweak doc string.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.h

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1417816&r1=1417815&r2=1417816&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Thu Dec  6 12:46:12 2012
@@ -261,6 +261,8 @@ svn_wc__conflict_skel_resolve(svn_boolea
  * Output arguments can be NULL if the value is not necessary.
  *
  * ### stsp asks: what is LOCATIONS?
+ * ### Set *LOCATIONS to an array of (svn_wc_conflict_version_t *)
+ *     representing ...
  *
  * TEXT_, PROP_ and TREE_CONFLICTED (when not NULL) will be set to TRUE
  * when the conflict contains the specified kind of conflict, otherwise