Show More
@@ -781,7 +781,10 b' def manifestmerge(' | |||||
781 | if ( |
|
781 | if ( | |
782 | pa not in ([wctx, p2] + wctx.parents()) |
|
782 | pa not in ([wctx, p2] + wctx.parents()) | |
783 | and not forcefulldiff |
|
783 | and not forcefulldiff | |
784 | and not repo.ui.configbool(b'experimental', b'merge-track-salvaged') |
|
784 | and not ( | |
|
785 | repo.ui.configbool(b'experimental', b'merge-track-salvaged') | |||
|
786 | or repo.filecopiesmode == b'changeset-sidedata' | |||
|
787 | ) | |||
785 | ): |
|
788 | ): | |
786 | # Identify which files are relevant to the merge, so we can limit the |
|
789 | # Identify which files are relevant to the merge, so we can limit the | |
787 | # total m1-vs-m2 diff to just those files. This has significant |
|
790 | # total m1-vs-m2 diff to just those files. This has significant |
General Comments 0
You need to be logged in to leave comments.
Login now