/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

  • 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/errors.py
2362
2362
    """A merge directive's target branch is required, but isn't a branch"""
2363
2363
 
2364
2364
    _fmt = ("Your branch does not have all of the revisions required in "
2365
 
            "order to merge this merge directive, however the target "
 
2365
            "order to merge this merge directive and the target "
2366
2366
            "location specified in the merge directive is not a branch: "
2367
2367
            "%(location)s.")
2368
2368