/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 doc/en/user-guide/hooks.txt

  • Committer: Vincent Ladeuil
  • Date: 2010-08-20 09:52:25 UTC
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: v.ladeuil+lp@free.fr-20100820095225-wijo4emfgvtmu2ku
BzrRemoveChangedFilesError is deprecated in 2.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/hooks.txt
81
81
  
82
82
  def merge_xml_files_hook(merger):
83
83
      """Hook to merge *.xml files"""
84
 
      return MergeXMLFiles(merger)
 
84
      return AlwaysConflictXMLMerger(merger)
85
85
  
86
86
  class AlwaysConflictXMLMerger(PerFileMerger):
87
87