← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Aaron Bentley
  • Date: 2006-03-01 03:47:49 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1595.
  • Revision ID: aaron.bentley@utoronto.ca-20060301034749-8e59bf2706d3c9c0
Switched to Rio format for merge-modified list

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
721
721
    def __init__(self, tree):
722
722
        BzrNewError.__init__(self)
723
723
        self.tree = tree
 
724
 
 
725
class MergeModifiedFormatError(BzrNewError):
 
726
    """Error in merge modified format"""