--- a/mercurial/filemerge.py	Wed Oct 23 17:08:57 2024 -0400
+++ b/mercurial/filemerge.py	Thu Oct 24 17:35:53 2024 +0200
@@ -481,6 +481,8 @@
     suppresses the markers."""
     ui = repo.ui
 
+    relaxed_sync = ui.configbool(b'experimental', b'relaxed-block-sync-merge')
+
     try:
         _verifytext(local, ui)
         _verifytext(base, ui)
@@ -489,7 +491,11 @@
         return True, True, False
     else:
         merged_text, conflicts = simplemerge.simplemerge(
-            local, base, other, mode=mode
+            local,
+            base,
+            other,
+            mode=mode,
+            relaxed_sync=relaxed_sync,
         )
         # fcd.flags() already has the merged flags (done in
         # mergestate.resolve())