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/questions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'subversion/libsvn_wc/questions.c') diff --git a/subversion/libsvn_wc/questions.c b/subversion/libsvn_wc/questions.c index 08583639b5718..c248f5d63adc0 100644 --- a/subversion/libsvn_wc/questions.c +++ b/subversion/libsvn_wc/questions.c @@ -475,7 +475,7 @@ internal_conflicted_p(svn_boolean_t *text_conflicted_p, svn_wc_conflict_action_t action; SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL, - db, local_abspath, + NULL, db, local_abspath, conflicts, scratch_pool, scratch_pool)); -- cgit v1.2.3