##// 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
Antoine Cezar
hg-core: remove the `Operation` trait...
r45917 //! 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.
Antoine Cezar
hg-core: add a `CatRev` operation...
r46112 mod cat;
Antoine Cezar
hg-core: define a `DebugData` `Operation`...
r46098 mod debugdata;
Raphaël Gomès
hg-core: define a `dirstate_status` `Operation`...
r45673 mod dirstate_status;
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502 mod find_root;
Antoine Cezar
hg-core: define a `ListTrackedFiles` `Operation`...
r45918 mod list_tracked_files;
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 pub use cat::{cat, CatRevError, CatRevErrorKind};
Antoine Cezar
rhg: add a `DebugData` `Command` to prepare the `rhg debugdata` subcommand...
r46099 pub use debugdata::{
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 debug_data, DebugDataError, DebugDataErrorKind, DebugDataKind,
Antoine Cezar
rhg: add a `DebugData` `Command` to prepare the `rhg debugdata` subcommand...
r46099 };
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 pub use find_root::{
find_root, find_root_from_path, FindRootError, FindRootErrorKind,
Antoine Cezar
hg-core: define a `ListTrackedFiles` `Operation`...
r45918 };
Antoine Cezar
hg-core: add a `ListRevTrackedFiles` operation...
r46107 pub use list_tracked_files::{
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 list_rev_tracked_files, FilesForRev, ListRevTrackedFilesError,
Antoine Cezar
hg-core: add a `ListRevTrackedFiles` operation...
r46107 ListRevTrackedFilesErrorKind,
};
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 pub use list_tracked_files::{
Dirstate, ListDirstateTrackedFilesError, ListDirstateTrackedFilesErrorKind,
};