diff options
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 caf39ed..e846577 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) |