← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Samuel Bronson
  • Date: 2009-04-17 14:57:15 UTC
  • mto: This revision was merged to the branch mainline in revision 4329.
  • Revision ID: naesten@gmail.com-20090417145715-sl6z3zo87w5nvngt
Add suggestion to use "missing" to message for DivergedBranches.

Show diffs side-by-side

added added

removed removed

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