weave_core/lib.rs
1pub mod conflict;
2pub mod git;
3pub mod merge;
4pub mod reconstruct;
5pub mod region;
6pub mod validate;
7
8pub use conflict::{parse_weave_conflicts, MarkerFormat, ParsedConflict};
9pub use merge::{entity_merge, entity_merge_fmt, entity_merge_with_registry, EntityAudit, MergeResult, ResolutionStrategy};
10pub use validate::{validate_merge, ModifiedEntity, SemanticWarning};