ok/jj
1
0
Fork 0
forked from mirrors/jj

Rename merge-tools.toml to merge_tool_config.toml

I think this fits in better with the other files in this dir
and is more descriptive.
This commit is contained in:
Ilya Grigoriev 2022-12-17 16:59:04 -08:00
parent 8f9cc3f4e8
commit f96f45125e
2 changed files with 1 additions and 1 deletions

View file

@ -77,7 +77,7 @@ fn default_mergetool_config() -> config::Config {
// loaded by separate builder.
config::Config::builder()
.add_source(config::File::from_str(
include_str!("merge-tools.toml"),
include_str!("merge_tool_config.toml"),
config::FileFormat::Toml,
))
.build()