svn commit: propchange - r13084 - svn:log

Author: kfogel
Revision: 13084
Property Name: svn:log

New Property Value:
Add cancellation support to svn_wc_resolved_conflict and increment
its revision to svn_wc_resolved_conflict2.

The following public API functions are now at new revisions:
    - svn_wc_resolved_conflict2

* subversion/include/svn_wc.h
  (svn_wc_resolved_conflict2): New function replacing svn_wc_resolved_conflict.
  (svn_wc_resolved_conflict): Deprecate.
* subversion/libsvn_client/resolved.c
  (svn_client_resolved2): Like svn_client_resolved but with cancellation.
  (svn_client_resolved): Call svn_client_resolved2.
* subversion/libsvn_wc/adm_crawler.c
  (restore_file): Use new API revisions.
* subversion/libsvn_wc/adm_ops.c
  (svn_wc_resolved_conflict): Use new API revisions.