← 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: Aaron Bentley
  • Date: 2009-06-15 15:20:24 UTC
  • mfrom: (4416.4.1 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 4443.
  • Revision ID: aaron@aaronbentley.com-20090615152024-w3crm2pxe7i9hdus
Merge nmb's diverged-branch docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/__init__.py
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.