← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/__init__.py

  • Committer: Martin Pool
  • Date: 2009-06-19 09:06:56 UTC
  • mfrom: (4463 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4464.
  • Revision ID: mbp@sourcefrog.net-20090619090656-d5weqeecyscv8kqp
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/__init__.py
490
490
Related commands::
491
491
 
492
492
  init    Change a directory into a versioned branch.
493
 
  branch  Create a new copy of a branch.
 
493
  branch  Create a new branch that is a copy of an existing branch.
494
494
  merge   Perform a three-way merge.
495
495
"""
496
496
 
733
733
                        'Options to show or record debug information')
734
734
topic_registry.register('log-formats', _load_from_file,
735
735
                        'Details on the logging formats available')
 
736
topic_registry.register('diverged-branches', _load_from_file,
 
737
                        'How to fix diverged branches')
736
738
 
737
739
 
738
740
# Register concept topics.