Re-exports§
pub use conflict::parse_weave_conflicts;pub use conflict::MarkerFormat;pub use conflict::ParsedConflict;pub use merge::entity_merge;pub use merge::entity_merge_fmt;pub use merge::entity_merge_with_registry;pub use merge::EntityAudit;pub use merge::MergeResult;pub use merge::ResolutionStrategy;pub use validate::validate_merge;pub use validate::ModifiedEntity;pub use validate::SemanticWarning;