← 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: Canonical.com Patch Queue Manager
  • Date: 2009-06-15 17:06:47 UTC
  • mfrom: (4441.1.1 bzr.ab.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090615170647-5zu6h93br8c4ue6i
(nmb) Add docs about diverged branches and refer to it when pushing
        fails

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.