* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict): Fix a doc string mistake from r1438737.
  (svn_wc__conflict_invoke_resolver): Add a TODO comment: we
    need to remove the conflict artifact files when marking as resolved.

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