744
724
'Details on the configuration settings available')
745
725
topic_registry.register('conflicts', _load_from_file,
746
726
'Types of conflicts and what to do about them')
747
729
topic_registry.register('hooks', _load_from_file,
748
730
'Points at which custom processing can be added')
749
731
topic_registry.register('log-formats', _load_from_file,