1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
#![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;