~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Merge Aarons conflict plugin for 0.1rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.")