author | Wagner Bruna <wbruna@yahoo.com> |
Wed, 27 Oct 2010 12:03:08 -0200 | |
branch | stable |
changeset 12858 | 6eec9d7c6e0f |
parent 12857 | a9f91c844a3b |
child 12859 | 76066903ae08 |
--- 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``