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/tree_conflicts.c | |
| parent | 38cef28c88864beaadac7a7cffdec6da952c3eb2 (diff) | |
Notes
Diffstat (limited to 'subversion/libsvn_wc/tree_conflicts.c')
| -rw-r--r-- | subversion/libsvn_wc/tree_conflicts.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |