aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/libsvn_wc/questions.c
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/libsvn_wc/questions.c')
-rw-r--r--subversion/libsvn_wc/questions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/libsvn_wc/questions.c b/subversion/libsvn_wc/questions.c
index 08583639b571..c248f5d63adc 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));