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 2012/09/20 17:42:39 UTC

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

Author: stsp
Date: Thu Sep 20 15:42:39 2012
New Revision: 1388085

URL: http://svn.apache.org/viewvc?rev=1388085&view=rev
Log:
* subversion/libsvn_wc/conflicts.h
  (svn_wc__conflict_read_info): Ask question in insufficient docstring.

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=1388085&r1=1388084&r2=1388085&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Thu Sep 20 15:42:39 2012
@@ -260,6 +260,8 @@ svn_wc__conflict_skel_resolve(svn_boolea
  *
  * Output arguments can be NULL if the value is not necessary.
  *
+ * ### stsp asks: what is LOCATIONS?
+ *
  * TEXT_, PROP_ and TREE_CONFLICTED (when not NULL) will be set to TRUE
  * when the conflict contains the specified kind of conflict, otherwise
  * to false.