ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: add comment why stock config isn't add_source()-d to main config_builder

Browse source
This commit is contained in:
Yuya Nishihara 2022-12-15 13:51:45 +09:00
parent 0a28b2c508
commit c86f7f87e4
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.rs
View file

@ -73,6 +73,8 @@ fn env_base() -> config::Config {
}
fn default_mergetool_config() -> config::Config {
// Syntax error in default config isn't a user error. That's why defaults are
// loaded by separate builder.
config::Config::builder()
.add_source(config::File::from_str(
include_str!("merge-tools.toml"),