← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2005-09-05 08:00:35 UTC
  • Revision ID: mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9
- start splitting code for xml (de)serialization away from objects
  preparatory to supporting multiple formats by a single library

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1196
1196
        try:
1197
1197
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1198
1198
        except bzrlib.errors.AmbiguousBase, e:
1199
 
            m = ("sorry, bzr can't determine the write merge base yet\n"
 
1199
            m = ("sorry, bzr can't determine the right merge base yet\n"
1200
1200
                 "candidates are:\n  "
1201
1201
                 + "\n  ".join(e.bases)
1202
1202
                 + "\n"