diff -r ad25986c4cd3 -r 38e0363dcbe0 mercurial/help/merge-tools.txt --- a/mercurial/help/merge-tools.txt Sun Sep 28 17:15:25 2014 +0200 +++ b/mercurial/help/merge-tools.txt Sun Sep 28 17:15:28 2014 +0200 @@ -68,7 +68,7 @@ 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 - ``internal:merge`` is used. + internal ``:merge`` is used. 8. The merge of the file fails and must be resolved before commit.