aboutsummaryrefslogtreecommitdiff
path: root/subversion/libsvn_client/mergeinfo.h
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2021-02-13 13:04:04 +0000
committerDimitry Andric <dim@FreeBSD.org>2021-02-13 13:04:04 +0000
commit8f67d37de16f4d4a3c64b754a079789ce8ad1b25 (patch)
treef70a7f1a49f2036e84a115da7b6b718d2c702e41 /subversion/libsvn_client/mergeinfo.h
parentbbee6e0814d5875b85b81f26fd4ca7a28b6f9570 (diff)
Diffstat (limited to 'subversion/libsvn_client/mergeinfo.h')
-rw-r--r--subversion/libsvn_client/mergeinfo.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/subversion/libsvn_client/mergeinfo.h b/subversion/libsvn_client/mergeinfo.h
index 1d6d524f5dd2..99e1bf9f80c7 100644
--- a/subversion/libsvn_client/mergeinfo.h
+++ b/subversion/libsvn_client/mergeinfo.h
@@ -74,8 +74,6 @@ typedef struct svn_client__merge_path_t
prior to a merge. May be NULL. */
svn_boolean_t inherited_mergeinfo; /* Whether PRE_MERGE_MERGEINFO was
explicit or inherited. */
- svn_boolean_t scheduled_for_deletion; /* ABSPATH is scheduled for
- deletion. */
svn_boolean_t immediate_child_dir; /* ABSPATH is an immediate child
directory of the merge target,
has no explicit mergeinfo prior