diff --git a/gix/src/merge.rs b/gix/src/merge.rs index 2111fa98a71..0d0bb711581 100644 --- a/gix/src/merge.rs +++ b/gix/src/merge.rs @@ -107,7 +107,9 @@ pub mod commit { /// pub mod tree { use gix_merge::blob::builtin_driver; - pub use gix_merge::tree::{Conflict, ContentMerge, Resolution, ResolutionFailure, TreatAsUnresolved}; + pub use gix_merge::tree::{ + treat_as_unresolved, Conflict, ContentMerge, Resolution, ResolutionFailure, TreatAsUnresolved, + }; /// The outcome produced by [`Repository::merge_trees()`](crate::Repository::merge_trees()). #[derive(Clone)]