← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Implemented remerge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
402
402
        self.graph = graph
403
403
 
404
404
class NotConflicted(BzrNewError):
405
 
    """File %(filename) is not conflicted."""
 
405
    """File %(filename)s is not conflicted."""
406
406
    def __init__(self, filename):
407
407
        BzrNewError.__init__(self)
408
408
        self.filename = filename