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/libsvn_wc/tree_conflicts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'subversion/libsvn_wc/tree_conflicts.c') diff --git a/subversion/libsvn_wc/tree_conflicts.c b/subversion/libsvn_wc/tree_conflicts.c index caf39eda9878..e8465775a61c 100644 --- a/subversion/libsvn_wc/tree_conflicts.c +++ b/subversion/libsvn_wc/tree_conflicts.c @@ -442,7 +442,7 @@ svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx, conflict->local_abspath, conflict->reason, conflict->action, - NULL, + NULL, NULL, scratch_pool, scratch_pool)); switch (conflict->operation) -- cgit v1.2.3