/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-17 17:57:15 UTC
  • mfrom: (4454 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4460.
  • Revision ID: john@arbash-meinel.com-20090617175715-p9ebpwx5rhc0qin1
Merge bzr.dev 4454 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

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