diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-05-31 20:58:28 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-05-31 20:58:28 +0000 |
| commit | bbee6e0814d5875b85b81f26fd4ca7a28b6f9570 (patch) | |
| tree | 726fcf32b39ca8976d7aa51b67c7236509f1bde4 /subversion/svn/resolve-cmd.c | |
| parent | 38cef28c88864beaadac7a7cffdec6da952c3eb2 (diff) | |
| download | src-bbee6e0814d5875b85b81f26fd4ca7a28b6f9570.tar.gz src-bbee6e0814d5875b85b81f26fd4ca7a28b6f9570.zip | |
Vendor import svn-1.14.0.vendor/subversion/subversion-1.14.0vendor/subversion
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=361669
svn path=/vendor/subversion/subversion-1.14.0/; revision=361670; tag=vendor/subversion/subversion-1.14.0
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 bbf9ff548ef5..efd176dc7cdd 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)); |