← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-07-26 16:17:43 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050726161743-3f45d541827c729b
Added merge_factory parameter to merge_flex

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
1
from merge_core import merge_flex
2
2
from changeset import generate_changeset, ExceptionConflictHandler
3
 
from changeset import Inventory
 
3
from changeset import Inventory, Diff3Merge
4
4
from bzrlib import find_branch
5
5
import bzrlib.osutils
6
6
from bzrlib.errors import BzrCommandError
240
240
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
241
241
                             generate_cset_optimized, get_inventory,
242
242
                             MergeConflictHandler(base_tree.root,
243
 
                                                  ignore_zero=ignore_zero))
 
243
                                                  ignore_zero=ignore_zero),
 
244
                             merge_factory=Diff3Merge)
244
245
 
245
246
    adjust_ids = []
246
247
    for id, path in inv_changes.iteritems():