#![deny(missing_docs)]
#[macro_use]
extern crate lazy_static;
#[macro_use]
extern crate log;
mod crates {
pub extern crate chrono;
pub extern crate log;
pub extern crate regex;
pub extern crate tempdir;
pub extern crate thiserror;
#[cfg(test)]
pub extern crate itertools;
}
mod git;
mod prepare;
pub use git::CommitId;
pub use git::GitContext;
pub use git::GitError;
pub use git::Identity;
pub use git::MergeStatus;
pub use prepare::Conflict;
pub use prepare::GitWorkArea;
pub use prepare::MergeCommand;
pub use prepare::MergeResult;
pub use prepare::SubmoduleConfig;
pub use prepare::WorkAreaError;
#[cfg(test)]
mod test;