diff -r 61f48581d8ef -r 4d622380ab39 mercurial/help/merge-tools.txt
--- a/mercurial/help/merge-tools.txt	Sun Oct 24 12:56:38 2010 +0200
+++ b/mercurial/help/merge-tools.txt	Sun Oct 24 18:37:59 2010 +0200
@@ -89,7 +89,7 @@
 5. If any usable merge tools are present in the merge-tools configuration
    section, the one with the highest priority is used.
 
-5. If a program named ``hgmerge`` can be found on the system, it is used - but
+6. If a program named ``hgmerge`` can be found on the system, it is used - but
    it will by default not be used for symlinks and binary files.
 
 7. If the file to be merged is not binary and is not a symlink, then