← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Committer: Aaron Bentley
Date: 2006-02-08 22:00:43 UTC
mto: (1558.1.4 Aaron's integration) (1534.9.2 Transactional Tree Transforms) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: abentley@panoramicfeedback.com-20060208220043-20386bb285886a2c

More conflict handling, test porting

files modified:
bzrlib/errors.py

bzrlib/patch.py

bzrlib/tests/test_merge_core.py

bzrlib/transform.py

Show diffs side-by-side

added added

removed removed

bzrlib/errors.py

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."""

Older »