713
726
'Types of conflicts and what to do about them')
714
727
topic_registry.register('debug-flags', _load_from_file,
715
728
'Options to show or record debug information')
716
731
topic_registry.register('log-formats', _load_from_file,
717
732
'Details on the logging formats available')
718
733
topic_registry.register('diverged-branches', _load_from_file,