← 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: 2005-10-06 03:57:20 UTC
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006035720-2e50eaeca13837bc
Commit aborts with conflicts in the tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
227
227
    """The connection has been closed."""
228
228
    pass
229
229
 
 
230
class ConflictsInTree(BzrError):
 
231
    def __init__(self):
 
232
        BzrError.__init__(self, "Working tree has conflicts.")