From f016ecc6ba941111aadcc2027c03f16860e4a1b9 Mon Sep 17 00:00:00 2001
From: souhailaS <serbout.souhaila@gmail.com>
Date: Wed, 19 Nov 2025 12:02:17 +0100
Subject: [PATCH] Fix skip_reuc flag in MergeOptions to use GIT_MERGE_SKIP_REUC

---
 src/merge.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/merge.rs b/src/merge.rs
index bdb32970a9..1456fd18db 100644
--- 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