/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: Robert Collins
  • Date: 2009-05-06 00:41:48 UTC
  • mfrom: (4332 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4333.
  • Revision ID: robertc@robertcollins.net-20090506004148-tlhyin7utnsaw6qr
Resolve NEWS.

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