/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

More conflict handling, test porting

Show diffs side-by-side

added added

removed removed

Lines of Context:
566
566
 
567
567
class CommandDefaultSyntax(BzrNewError):
568
568
    """Sytax error in defaults for "%(command_name)s": %(error)s"""
 
569
 
 
570
class NoDiff3(BzrNewError):
 
571
    """Diff3 is not installed on this machine."""