/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: Ian Clatworthy
  • Date: 2010-01-03 01:41:00 UTC
  • mto: (4944.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4945.
  • Revision ID: ian.clatworthy@canonical.com-20100103014100-7240p8r4tl347nrj
conflicts topic renamed to conflict-types and other minor help clean-ups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/__init__.py
647
647
differences.
648
648
"""
649
649
 
650
 
_branches_out_of_sync = """Branches out of sync
 
650
_branches_out_of_sync = """Branches Out of Sync
651
651
 
652
652
When reconfiguring a checkout, tree or branch into a lightweight checkout,
653
653
a local branch must be destroyed.  (For checkouts, this is the local branch
742
742
                        'Information on configuring authentication')
743
743
topic_registry.register('configuration', _load_from_file,
744
744
                        'Details on the configuration settings available')
745
 
topic_registry.register('conflicts', _load_from_file,
 
745
topic_registry.register('conflict-types', _load_from_file,
746
746
                        'Types of conflicts and what to do about them')
747
747
topic_registry.register('debug-flags', _load_from_file,
748
748
                        'Options to show or record debug information')
749
749
topic_registry.register('log-formats', _load_from_file,
750
750
                        'Details on the logging formats available')
751
 
topic_registry.register('diverged-branches', _load_from_file,
752
 
                        'How to fix diverged branches')
753
751
 
754
752
 
755
753
# Register concept topics.
763
761
topic_registry.register('content-filters', _load_from_file,
764
762
                        'Conversion of content into/from working trees',
765
763
                        SECT_CONCEPT)
 
764
topic_registry.register('diverged-branches', _load_from_file,
 
765
                        'How to fix diverged branches',
 
766
                        SECT_CONCEPT)
766
767
topic_registry.register('eol', _load_from_file,
767
768
                        'Information on end-of-line handling',
768
769
                        SECT_CONCEPT)