Skip to content

Commit

Permalink
refactor: Simplify code
Browse files Browse the repository at this point in the history
  • Loading branch information
jpedroh committed Dec 8, 2023
1 parent 2b74d24 commit 84c4f38
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bin/src/control.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub fn run_tool_on_merge_scenario(
&matchings_right_base,
&matchings_left_right,
)
.map_err(|error| ExecutionError::MergeError(error))?;
.map_err(ExecutionError::MergeError)?;

match result.has_conflict() {
true => Ok(ExecutionResult::WithConflicts(result.to_string())),
Expand Down

0 comments on commit 84c4f38

Please sign in to comment.