Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

external diff-editors: allow 3-pane diff, set up meld-3. #2003

Merged
merged 4 commits into from
Aug 22, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
cli_utils: reduce duplication in select_diff
  • Loading branch information
ilyagr committed Aug 22, 2023
commit 274c161d293ce5011c94ba1f5502b065692a9601
11 changes: 1 addition & 10 deletions cli/src/cli_util.rs
Original file line number Diff line number Diff line change
@@ -1485,16 +1485,7 @@ impl WorkspaceCommandTransaction<'_> {
matcher: &dyn Matcher,
) -> Result<TreeId, CommandError> {
if interactive {
let base_ignores = self.helper.base_ignores();
let settings = &self.helper.settings;
Ok(crate::merge_tools::edit_diff(
ui,
left_tree,
right_tree,
instructions,
base_ignores,
settings,
)?)
self.edit_diff(ui, left_tree, right_tree, instructions)
} else if matcher.visit(&RepoPath::root()) == Visit::AllRecursively {
// Optimization for a common case
Ok(right_tree.id().clone())