equal
deleted
inserted
replaced
1611 pas = [wc] |
1611 pas = [wc] |
1612 elif not branchmerge: |
1612 elif not branchmerge: |
1613 pas = [p1] |
1613 pas = [p1] |
1614 |
1614 |
1615 # deprecated config: merge.followcopies |
1615 # deprecated config: merge.followcopies |
1616 followcopies = repo.ui.configbool('merge', 'followcopies', True) |
1616 followcopies = repo.ui.configbool('merge', 'followcopies') |
1617 if overwrite: |
1617 if overwrite: |
1618 followcopies = False |
1618 followcopies = False |
1619 elif not pas[0]: |
1619 elif not pas[0]: |
1620 followcopies = False |
1620 followcopies = False |
1621 if not branchmerge and not wc.dirty(missing=True): |
1621 if not branchmerge and not wc.dirty(missing=True): |