equal
deleted
inserted
replaced
1050 if pas[0] is None: |
1050 if pas[0] is None: |
1051 if repo.ui.config("merge", "preferancestor") == '*': |
1051 if repo.ui.config("merge", "preferancestor") == '*': |
1052 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) |
1052 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) |
1053 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] |
1053 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] |
1054 else: |
1054 else: |
1055 pas = [p1.ancestor(p2, warn=True)] |
1055 pas = [p1.ancestor(p2, warn=branchmerge)] |
1056 |
1056 |
1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
1058 |
1058 |
1059 ### check phase |
1059 ### check phase |
1060 if not overwrite and len(pl) > 1: |
1060 if not overwrite and len(pl) > 1: |