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: jj-vcs/jj
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d84325803546e8c762562ef0b2b6ec4d1ac95557
Choose a base ref
..
head repository: jj-vcs/jj
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45a69b1e18aaacf59e079e453c7316c7c33ce28a
Choose a head ref
Showing with 3 additions and 6 deletions.
  1. +3 −6 cli/src/cli_util.rs
9 changes: 3 additions & 6 deletions cli/src/cli_util.rs
Original file line number Diff line number Diff line change
@@ -1382,12 +1382,9 @@ Then run `jj squash` to move the resolution into the conflicted commit."#,
&self,
setting_key: &str,
) -> Result<Vec<StringPattern>, CommandError> {
let err_msg = format!("Error parsing pattern for advance-branches {setting_key}.");
match self
.settings
.config()
.get_array(&format!("experimental-advance-branches.{setting_key}"))
{
let setting = format!("experimental-advance-branches.{setting_key}");
let err_msg = format!("Error parsing pattern for {setting}");
match self.settings.config().get_array(&setting) {
Ok(patterns) => patterns
.into_iter()
.map(|p| {