Merge pull request #1194 from souhailaS/fix-skip-reuc

ehuss · web-flow · commit a2b4f0ba6b81 · 2025-11-20T15:56:23.000Z
Fix skip_reuc flag in MergeOptions to use GIT_MERGE_SKIP_REUC
diff --git a/src/merge.rs b/src/merge.rs
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ impl MergeOptions {`
`95`	`95`
`96`	`96`	`/// Do not write the REUC extension on the generated index`
`97`	`97`	`pub fn skip_reuc(&mut self, skip: bool) -> &mut MergeOptions {`
`98`		`- self.flag(raw::GIT_MERGE_FAIL_ON_CONFLICT as u32, skip)`
	`98`	`+ self.flag(raw::GIT_MERGE_SKIP_REUC as u32, skip)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/// If the commits being merged have multiple merge bases, do not build a`