From bbee6e0814d5875b85b81f26fd4ca7a28b6f9570 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 31 May 2020 20:58:28 +0000 Subject: Vendor import svn-1.14.0. --- subversion/svn/resolve-cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'subversion/svn/resolve-cmd.c') diff --git a/subversion/svn/resolve-cmd.c b/subversion/svn/resolve-cmd.c index bbf9ff548ef5a..efd176dc7cdd0 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)); -- cgit v1.2.3