diff -r 513b413702e8 -r a021da4ec509 mercurial/debugcommands.py --- a/mercurial/debugcommands.py Wed Oct 23 17:08:57 2024 -0400 +++ b/mercurial/debugcommands.py Thu Oct 24 17:35:53 2024 +0200 @@ -255,6 +255,10 @@ progress = ui.makeprogress( _(b'building'), unit=_(b'revisions'), total=total ) + merge_relaxed_sync = ui.configbool( + b'experimental', + b'relaxed-block-sync-merge', + ) with progress, repo.wlock(), repo.lock(), repo.transaction(b"builddag"): at = -1 atbranch = b'default' @@ -279,7 +283,12 @@ base, local, other = [ x[fn].data() for x in (pa, p1, p2) ] - m3 = simplemerge.Merge3Text(base, local, other) + m3 = simplemerge.Merge3Text( + base, + local, + other, + relaxed_sync=merge_relaxed_sync, + ) ml = [ l.strip() for l in simplemerge.render_minimized(m3)[0]