/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: Neil Martinsen-Burrell
  • Date: 2009-06-08 05:00:01 UTC
  • mto: (4441.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 4443.
  • Revision ID: nmb@wartburg.edu-20090608050001-7znk3433urf3bf0p
Fix 269477 Add documentation 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.