← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

ApplyMerge3 -> Merge3Merger

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
36
36
import bzrlib.osutils
37
37
from bzrlib.osutils import rename, pathjoin
38
38
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
39
 
from bzrlib.transform import (Merge3Merger as ApplyMerge3, WeaveMerger, 
40
 
                              Diff3Merger)
 
39
from bzrlib.transform import (Merge3Merger, WeaveMerger, Diff3Merger)
41
40
from bzrlib.trace import mutter, warning, note
42
41
from bzrlib.workingtree import WorkingTree
43
42
 
100
99
 
101
100
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
102
101
                backup_files=False, 
103
 
                merge_type=ApplyMerge3, 
 
102
                merge_type=Merge3Merger, 
104
103
                interesting_ids=None, 
105
104
                show_base=False, 
106
105
                reprocess=False, 
353
352
        return new_inventory_list
354
353
 
355
354
 
356
 
merge_types = {     "merge3": (ApplyMerge3, "Native diff3-style merge"), 
 
355
merge_types = {     "merge3": (Merge3Merger, "Native diff3-style merge"), 
357
356
                     "diff3": (Diff3Merger,  "Merge using external diff3"),
358
357
                     'weave': (WeaveMerger, "Weave-based merge")
359
358
              }