← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Robert J. Tanner
  • Date: 2009-04-30 22:40:42 UTC
  • mfrom: (4323 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4324.
  • Revision ID: tanner@real-time.com-20090430224042-53v45axtue5bw45l
Merge 1.14.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
566
566
_format_registry = MergeDirectiveFormatRegistry()
567
567
_format_registry.register(MergeDirective)
568
568
_format_registry.register(MergeDirective2)
 
569
# 0.19 never existed.  It got renamed to 0.90.  But by that point, there were
 
570
# already merge directives in the wild that used 0.19. Registering with the old
 
571
# format string to retain compatibility with those merge directives.
569
572
_format_registry.register(MergeDirective2,
570
573
                          'Bazaar merge directive format 2 (Bazaar 0.19)')