Skip to content

Fix skip_reuc flag in MergeOptions to use GIT_MERGE_SKIP_REUC #1194

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 20, 2025
Merged

Fix skip_reuc flag in MergeOptions to use GIT_MERGE_SKIP_REUC #1194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl MergeOptions {

/// Do not write the REUC extension on the generated index
pub fn skip_reuc(&mut self, skip: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FAIL_ON_CONFLICT as u32, skip)
self.flag(raw::GIT_MERGE_SKIP_REUC as u32, skip)
}

/// If the commits being merged have multiple merge bases, do not build a
Expand Down