← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Knit support for commit refactoring.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1854
1854
    _fmt = "Diff3 is not installed on this machine."
1855
1855
 
1856
1856
 
 
1857
class ExistingContent(BzrError):
 
1858
    """Added in bzrlib 0.92, used by VersionedFile.add_lines."""
 
1859
 
 
1860
    _fmt = "The content being inserted is already present."
 
1861
 
 
1862
 
1857
1863
class ExistingLimbo(BzrError):
1858
1864
 
1859
1865
    _fmt = """This tree contains left-over files from a failed operation.