Mercurial > hg

diff mercurial/help/merge-tools.txt @ 12826:4d622380ab39 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge-tools.txt: 6 comes after 5
author Patrick Mezard <pmezard@gmail.com>
date Sun, 24 Oct 2010 18:37:59 +0200
parents 93d6559a9cbc
children 830be2c57626
line wrap: on
line diff
--- 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