Skip to content

Commit

Permalink
Fix reference
Browse files Browse the repository at this point in the history
  • Loading branch information
luveti authored Oct 14, 2024
1 parent cd5b9ac commit 852a0cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion examples/pull.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ fn do_merge<'a>(
checkout_options.conflict_style_merge(true);
checkout_options.force();

let mut merge_options = MergeOptions::new();
let mut merge_options = git2::MergeOptions::new();
merge_options.diff3_style(true);

repo.merge(
Expand Down

0 comments on commit 852a0cd

Please sign in to comment.