← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 03:03:18 UTC
  • mfrom: (1551.2.23 Aaron's small fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
A whack of changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
846
846
    merger.backup_files = backup_files
847
847
    merger.merge_type = merge_type
848
848
    merger.interesting_ids = interesting_ids
 
849
    merger.ignore_zero = ignore_zero
849
850
    if interesting_files:
850
851
        assert not interesting_ids, ('Only supply interesting_ids'
851
852
                                     ' or interesting_files')