##// END OF EJS Templates
filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606

File last commit:

r46751:dca9cb99 default
r46755:3ca5ca38 default
Show More
mod.rs
23 lines | 781 B | application/rls-services+xml | RustLexer
//! A distinction is made between operations and commands.
//! An operation is what can be done whereas a command is what is exposed by
//! the cli. A single command can use several operations to achieve its goal.
mod cat;
mod debugdata;
mod dirstate_status;
mod find_root;
mod list_tracked_files;
pub use cat::{cat, CatRevError, CatRevErrorKind};
pub use debugdata::{
debug_data, DebugDataError, DebugDataErrorKind, DebugDataKind,
};
pub use find_root::{
find_root, find_root_from_path, FindRootError, FindRootErrorKind,
};
pub use list_tracked_files::{
list_rev_tracked_files, FilesForRev, ListRevTrackedFilesError,
ListRevTrackedFilesErrorKind,
};
pub use list_tracked_files::{
Dirstate, ListDirstateTrackedFilesError, ListDirstateTrackedFilesErrorKind,
};