← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_errors.py

  • Committer: James Westby
  • Date: 2008-07-29 21:17:26 UTC
  • mto: (3592.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3594.
  • Revision ID: jw+debian@jameswestby.net-20080729211726-g3a8uy9qkiy91euo
Replace "however" with "and" at John's request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_errors.py
388
388
        error = errors.TargetNotBranch('foo')
389
389
        self.assertEqual(
390
390
            "Your branch does not have all of the revisions required in "
391
 
            "order to merge this merge directive, however the target "
 
391
            "order to merge this merge directive and the target "
392
392
            "location specified in the merge directive is not a branch: "
393
393
            "foo.", str(error))
394
394