Rev 5378: (spiv) Fix typo in merge hook example. (Andrew Bennetts) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5378 [merge]
revision-id: pqm at pqm.ubuntu.com-20100817073012-x0d8i7rljyttijad
parent: pqm at pqm.ubuntu.com-20100816064617-wizstoapjbffkj05
parent: andrew.bennetts at canonical.com-20100817030833-1uederz2jefgwaw0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-08-17 08:30:12 +0100
message:
  (spiv) Fix typo in merge hook example. (Andrew Bennetts)
modified:
  doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
=== modified file 'doc/en/user-guide/hooks.txt'
--- a/doc/en/user-guide/hooks.txt	2010-04-22 07:35:06 +0000
+++ b/doc/en/user-guide/hooks.txt	2010-08-17 03:08:33 +0000
@@ -81,7 +81,7 @@
   
   def merge_xml_files_hook(merger):
       """Hook to merge *.xml files"""
-      return MergeXMLFiles(merger)
+      return AlwaysConflictXMLMerger(merger)
   
   class AlwaysConflictXMLMerger(PerFileMerger):