~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Printed conflicts in MalformedTransform

Show diffs side-by-side

added added

removed removed

Lines of Context:
477
477
    """Key %(key)s is already present in map"""
478
478
 
479
479
class MalformedTransform(BzrNewError):
480
 
    """Tree transform is malformed"""
 
480
    """Tree transform is malformed %(conflicts)r"""
481
481
 
482
482
 
483
483
class BzrBadParameter(BzrNewError):