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

r47164:2e203308 default
r47224:6bb80672 default
Show More
Cargo.toml
17 lines | 339 B | application/toml | TOMLLexer
[package]
name = "rhg"
version = "0.1.0"
authors = [
"Antoine Cezar <antoine.cezar@octobus.net>",
"Raphaël Gomès <raphael.gomes@octobus.net>",
]
edition = "2018"
[dependencies]
hg-core = { path = "../hg-core"}
clap = "2.33.1"
derive_more = "0.99"
log = "0.4.11"
micro-timer = "0.3.1"
env_logger = "0.7.1"
format-bytes = "0.1.3"