Show More
@@ -776,7 +776,13 b' def manifestmerge(' | |||
|
776 | 776 | # - ma is the same as m1 or m2, which we're just going to diff again later |
|
777 | 777 | # - The caller specifically asks for a full diff, which is useful during bid |
|
778 | 778 | # merge. |
|
779 | if pa not in ([wctx, p2] + wctx.parents()) and not forcefulldiff: | |
|
779 | # - we are tracking salvaged files specifically hence should process all | |
|
780 | # files | |
|
781 | if ( | |
|
782 | pa not in ([wctx, p2] + wctx.parents()) | |
|
783 | and not forcefulldiff | |
|
784 | and not repo.ui.configbool(b'experimental', b'merge-track-salvaged') | |
|
785 | ): | |
|
780 | 786 | # Identify which files are relevant to the merge, so we can limit the |
|
781 | 787 | # total m1-vs-m2 diff to just those files. This has significant |
|
782 | 788 | # performance benefits in large repositories. |
General Comments 0
You need to be logged in to leave comments.
Login now