From 54d4c9c475dda523e481bb5e42dc80a5669ffe9b Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Tue, 15 Aug 2023 17:54:03 -0700
Subject: [PATCH] cli_utils: reduce duplication in `select_diff`

---
 cli/src/cli_util.rs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs
index d7d703224..099b9f562 100644
--- a/cli/src/cli_util.rs
+++ b/cli/src/cli_util.rs
@@ -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())