← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

ApplyMerge3 -> Merge3Merger

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1610
1610
 
1611
1611
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1612
1612
            show_base=False, reprocess=False):
1613
 
        from bzrlib.transform import Merge3Merger as ApplyMerge3
 
1613
        from bzrlib.transform import Merge3Merger
1614
1614
        if merge_type is None:
1615
 
            merge_type = ApplyMerge3
 
1615
            merge_type = Merge3Merger
1616
1616
        if branch is None:
1617
1617
            branch = WorkingTree.open_containing(u'.')[0].branch.get_parent()
1618
1618
            if branch is None:
1667
1667
    def run(self, file_list=None, merge_type=None, show_base=False,
1668
1668
            reprocess=False):
1669
1669
        from bzrlib.merge import merge_inner, transform_tree
1670
 
        from bzrlib.transform import Merge3Merger as ApplyMerge3
 
1670
        from bzrlib.transform import Merge3Merger
1671
1671
        if merge_type is None:
1672
 
            merge_type = ApplyMerge3
 
1672
            merge_type = Merge3Merger
1673
1673
        tree, file_list = tree_files(file_list)
1674
1674
        tree.lock_write()
1675
1675
        try: