← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Martin Pool
  • Date: 2007-08-09 03:39:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2693.
  • Revision ID: mbp@sourcefrog.net-20070809033931-s6dr6q38rs82ni5i
Fix up other references to 0.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
325
325
 
326
326
class MergeDirective2(_BaseMergeDirective):
327
327
 
328
 
    _format_string = 'Bazaar merge directive format 2 (Bazaar 0.19)'
 
328
    _format_string = 'Bazaar merge directive format 2 (Bazaar 0.90)'
329
329
 
330
330
    def __init__(self, revision_id, testament_sha1, time, timezone,
331
331
                 target_branch, patch=None, source_branch=None, message=None,