← 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-10-22 23:45:01 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: aaron.bentley@utoronto.ca-20051022234501-236f63fda8c236ea
Restored merge type selection

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
273
273
    merger.set_other(other_revision)
274
274
    merger.set_base(base_revision)
275
275
    merger.backup_files = backup_files
276
 
    merger.merge_type = ApplyMerge3
 
276
    merger.merge_type = merge_type 
277
277
    merger.set_interesting_files(file_list)
278
278
    merger.show_base = show_base 
279
279
    merger.conflict_handler = MergeConflictHandler(merger.this_tree,