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/libsvn_wc/questions.c | |
| parent | 38cef28c88864beaadac7a7cffdec6da952c3eb2 (diff) | |
Notes
Diffstat (limited to 'subversion/libsvn_wc/questions.c')
| -rw-r--r-- | subversion/libsvn_wc/questions.c | 2 |
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)); |