← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/hooks.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

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