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:
parent
8f9cc3f4e8
commit
f96f45125e
2 changed files with 1 additions and 1 deletions
|
@ -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()
|
||||
|
|
Loading…
Reference in a new issue