##// END OF EJS Templates
diff: replace --merge option by config option...
diff: replace --merge option by config option I can't think of any reason you'd want to enable the merge diff on a run-to-run basis; you'd probably either always or never want it set (though I can't see why you'd never want it set). If you have it set, you'll probably also want the same output in `hg log -p` output. Having a single config option for the feature makes sense. Differential Revision: https://phab.mercurial-scm.org/D9956

File last commit:

r47175:1dcd9c99 default
r47246:d57e607d default
Show More
mod.rs
12 lines | 455 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: define a `ListTrackedFiles` `Operation`...
r45918 mod list_tracked_files;
Simon Sapin
rust: remove three enums that were identical to `RevlogError`...
r47166 pub use cat::cat;
pub use debugdata::{debug_data, DebugDataKind};
Simon Sapin
rust: Remove DirstateParseError and ListDirstateTrackedFilesError...
r47169 pub use list_tracked_files::Dirstate;
Simon Sapin
rust: remove three enums that were identical to `RevlogError`...
r47166 pub use list_tracked_files::{list_rev_tracked_files, FilesForRev};