← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Aaron Bentley
  • Date: 2005-10-23 00:26:17 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: aaron.bentley@utoronto.ca-20051023002617-d57101d2671509f7
Preliminary weave merge support

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
411
411
 
412
412
 
413
413
class Diff3Merge(object):
 
414
    history_based = False
414
415
    def __init__(self, file_id, base, other):
415
416
        self.file_id = file_id
416
417
        self.base = base