diff options
Diffstat (limited to 'subversion/svn/resolve-cmd.c')
| -rw-r--r-- | subversion/svn/resolve-cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/svn/resolve-cmd.c b/subversion/svn/resolve-cmd.c index bbf9ff5..efd176d 100644 --- a/subversion/svn/resolve-cmd.c +++ b/subversion/svn/resolve-cmd.c @@ -109,7 +109,7 @@ svn_cl__walk_conflicts(apr_array_header_t *targets, svn_client_conflict_t *conflict; svn_pool_clear(iterpool); - + SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton)); SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool)); |