← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Robert Collins
  • Date: 2005-10-07 01:01:07 UTC
  • mfrom: (1185.13.2)
  • Revision ID: robertc@robertcollins.net-20051007010107-fe48434051a15b92
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
244
244
    """The connection has been closed."""
245
245
    pass
246
246
 
 
247
class ConflictsInTree(BzrError):
 
248
    def __init__(self):
 
249
        BzrError.__init__(self, "Working tree has conflicts.")