--- a/mercurial/merge.py Wed Sep 30 12:46:49 2020 +0200
+++ b/mercurial/merge.py Mon Sep 14 23:46:38 2020 +0200
@@ -781,7 +781,10 @@
if (
pa not in ([wctx, p2] + wctx.parents())
and not forcefulldiff
- and not repo.ui.configbool(b'experimental', b'merge-track-salvaged')
+ and not (
+ repo.ui.configbool(b'experimental', b'merge-track-salvaged')
+ or repo.filecopiesmode == b'changeset-sidedata'
+ )
):
# Identify which files are relevant to the merge, so we can limit the
# total m1-vs-m2 diff to just those files. This has significant