Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Canop/broot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4be8d8ba0532ed9b1d9b1614d308bc57443aac26
Choose a base ref
..
head repository: Canop/broot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: acecaf4d9ee4f90506c962c07e33a72c04fd21fc
Choose a head ref
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/conf/conf.rs
1 change: 1 addition & 0 deletions src/conf/conf.rs
Original file line number Diff line number Diff line change
@@ -190,6 +190,7 @@ impl Conf {
overwrite!(self, max_staged_count, conf);
overwrite!(self, show_matching_characters_on_path_searches, conf);
overwrite!(self, content_search_max_file_size, conf);
overwrite!(self, root_relative_path, conf);
self.verbs.append(&mut conf.verbs);
// the following maps are "additive": we can add entries from several
// config files and they still make sense