← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Jelmer Vernooij
  • Date: 2009-05-05 10:35:27 UTC
  • mto: This revision was merged to the branch mainline in revision 4329.
  • Revision ID: jelmer@samba.org-20090505103527-fcj8douevkfc7znx
Remove extra space.

Show diffs side-by-side

added added

removed removed

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