diff options
author | John Estabrook <jestabro@vyos.io> | 2025-07-08 08:01:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-07-08 08:01:19 -0500 |
commit | 74c67327160d8dffb8d79bf6691852855715d5f8 (patch) | |
tree | c63ea88a83a0c7bea55ac56729668dd6674ee140 /src/config_diff.mli | |
parent | db5220be72b545863aca753f6d7c159bab98446a (diff) | |
parent | c01c370535640d3cbd4e4c3839d570c596e11695 (diff) | |
download | vyos1x-config-current.tar.gz vyos1x-config-current.zip |
T7499: add non-/destructive configtree merge
Diffstat (limited to 'src/config_diff.mli')
-rw-r--r-- | src/config_diff.mli | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/config_diff.mli b/src/config_diff.mli index 4262a58..fdc662c 100644 --- a/src/config_diff.mli +++ b/src/config_diff.mli @@ -45,6 +45,7 @@ val clone : ?recurse:bool -> ?set_values:string list option -> Config_tree.t -> val diff_tree : string list -> Config_tree.t -> Config_tree.t -> Config_tree.t val show_diff : ?cmds:bool -> string list -> Config_tree.t -> Config_tree.t -> string val tree_union : Config_tree.t -> Config_tree.t -> Config_tree.t +val tree_merge : ?destructive:bool -> Config_tree.t -> Config_tree.t -> Config_tree.t val mask_tree : Config_tree.t -> Config_tree.t -> Config_tree.t val make_diff_cstore : Config_tree.t -> Config_tree.t -> int -> Diff_cstore.t result val get_tagged_delete_tree : Config_tree.t -> Config_tree.t |