* subversion/libsvn_wc/conflicts.h,
  subversion/libsvn_wc/conflicts.c
  (svn_wc__resolve_text_conflict): Rename to 'mark_resolved_text_conflict'
    for clarity, since we have a bunch of other functions that actually
    resolve conflicts and this is not one of them.

* subversion/libsvn_wc/adm_crawler.c
  (restore_file): Update caller, and rename the 'resolve_text_conflict'
    parameter to 'mark_resolved_text_conflict' similarly.
  (svn_wc_restore, restore_node): Annotate the calls to restore_file().


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