mod entry;
mod merge;
mod parser;
mod resolve;
mod session;
pub use entry::{parse_buffer_entry, serialize_buffer_entry, BufferEntry, BufferOp};
pub use merge::{apply_clean_entries, merge, Conflict, MergeResult};
pub use parser::{parse_buffer_folder, parse_buffer_folders, BufferParseError};
pub use resolve::{resolve, Resolution};
pub use session::{format_conflict_markers, MergeSession, MergeSessionError, MergeSessionResult};