Skip to content

Commit

Permalink
merge_tools: rename MergeTool::Internal -> MergeTool::Builtin
Browse files Browse the repository at this point in the history
The name we will expose to the user is `builtin`, so this changes the internal messaging to match that.
  • Loading branch information
arxanas committed Aug 27, 2023
1 parent a0ae09f commit d434c1e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cli/src/merge_tools/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub fn run_mergetool(

let editor = get_merge_tool_from_settings(ui, settings)?;
match editor {
MergeTool::Internal => unimplemented!("run_mergetool with internal mergetool"),
MergeTool::Builtin => unimplemented!("run_mergetool with internal mergetool"),
MergeTool::External(editor) => external::run_mergetool_external(
&editor, file_merge, content, repo_path, conflict, tree,
),
Expand All @@ -126,7 +126,7 @@ pub fn edit_diff(
// Start a diff editor on the two directories.
let editor = get_diff_editor_from_settings(ui, settings)?;
match editor {
MergeTool::Internal => unimplemented!("run_mergetool with internal mergetool"),
MergeTool::Builtin => unimplemented!("run_mergetool with internal mergetool"),
MergeTool::External(editor) => edit_diff_external(
editor,
left_tree,
Expand All @@ -140,7 +140,7 @@ pub fn edit_diff(

#[derive(Clone, Debug, Eq, PartialEq)]
pub enum MergeTool {
Internal,
Builtin,
External(ExternalMergeTool),
}

Expand Down

0 comments on commit d434c1e

Please sign in to comment.