Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help/merge-tools.txt @ 12858:6eec9d7c6e0f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: fix typo in merge-tools topic
author Wagner Bruna <wbruna@yahoo.com>
date Wed, 27 Oct 2010 12:03:08 -0200
parents 830be2c57626
children 0c4bec9596d8
line wrap: on
line diff
--- a/mercurial/help/merge-tools.txt	Wed Oct 27 12:05:37 2010 +0200
+++ b/mercurial/help/merge-tools.txt	Wed Oct 27 12:03:08 2010 -0200
@@ -31,7 +31,7 @@
 symlink, if it can handle binary files if the file is binary, and if a
 GUI is available if the tool requires a GUI.
 
-There are a some internal merge tools which can be used. The internal
+There are some internal merge tools which can be used. The internal
 merge tools are:
 
 ``internal:merge``