* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict_on_node,
   resolve_prop_conflict_on_node): Add note on the status of conflict markers.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1448547 13f79535-47bb-0310-9956-ffa450edef68