##// 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:

r47174:ca3f73cc default
r47224:6bb80672 default
Show More
exitcode.rs
10 lines | 214 B | application/rls-services+xml | RustLexer
pub type ExitCode = i32;
/// Successful exit
pub const OK: ExitCode = 0;
/// Generic abort
pub const ABORT: ExitCode = 255;
/// Command or feature not implemented by rhg
pub const UNIMPLEMENTED: ExitCode = 252;