Index: subversion/include/svn_wc.h
===================================================================
--- subversion/include/svn_wc.h	(revision 32651)
+++ subversion/include/svn_wc.h	(working copy)
@@ -1969,8 +1969,15 @@
  * entries (@a entry) is in state of conflict; return the answers in
  * @a text_conflicted_p and @a prop_conflicted_p.
  *
- * (If the entry mentions that a .rej or .prej exist, but they are
- * both removed, assume the conflict has been resolved by the user.)
+ * If the @a entry mentions that a text conflict file (.rej) exists, but it
+ * cannot be found, assume the text conflict has been resolved by the user
+ * and return FALSE in @a text_conflicted_p.
+ *
+ * Similarly, if the @a entry mentions that a property conflicts file
+ * (.prej) exists, but it cannot be found, assume the property conflicts
+ * have been resolved by the user and return FALSE in @a prop_conflicted_p.
+ *
+ * The @a entry is not updated.
  */
 svn_error_t *
 svn_wc_conflicted_p(svn_boolean_t *text_conflicted_p,