hayson_engine/buffer/mod.rs
1mod entry;
2mod merge;
3mod parser;
4mod resolve;
5mod session;
6
7pub use entry::{parse_buffer_entry, serialize_buffer_entry, BufferEntry, BufferOp};
8pub use merge::{apply_clean_entries, merge, Conflict, MergeResult};
9pub use parser::{parse_buffer_folder, parse_buffer_folders, BufferParseError};
10pub use resolve::{resolve, Resolution};
11pub use session::{format_conflict_markers, MergeSession, MergeSessionError, MergeSessionResult};