~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-05-05 12:41:04 UTC
  • mfrom: (4297.3.3 missing)
  • Revision ID: pqm@pqm.ubuntu.com-20090505124104-hdr2see3289mg7dn
(Samuel Bronson) Suggest 'bzr missing' in DivergedBranches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1173
1173
class DivergedBranches(BzrError):
1174
1174
 
1175
1175
    _fmt = ("These branches have diverged."
1176
 
            " Use the merge command to reconcile them.")
 
1176
            " Use the missing command to see how.\n"
 
1177
            "Use the merge command to reconcile them.")
1177
1178
 
1178
1179
    def __init__(self, branch1, branch2):
1179
1180
        self.branch1 = branch1