/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: Andrew Bennetts
  • Date: 2008-10-01 06:10:17 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3755.
  • Revision ID: andrew.bennetts@canonical.com-20081001061017-z97p3m0n9qqjzklf
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/__init__.py
711
711
topic_registry.register('criss-cross', _criss_cross,
712
712
                        'Information on criss-cross merging', SECT_CONCEPT)
713
713
topic_registry.register('sync-for-reconfigure', _branches_out_of_sync,
714
 
                        'Information on criss-cross merging', SECT_CONCEPT)
 
714
                        'Steps to resolve "out-of-sync" when reconfiguring',
 
715
                        SECT_CONCEPT)
715
716
 
716
717
 
717
718
class HelpTopicIndex(object):