diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -344,7 +344,7 @@ def convert(ui, src, dest=None, revmapfi The 'include' directive causes a file, or all files under a directory, to be included in the destination repository, and the - exclussion of all other files and dirs not explicitely included. + exclusion of all other files and dirs not explicitely included. The 'exclude' directive causes files or directories to be omitted. The 'rename' directive renames a file or directory. To rename from a subdirectory into the root of the repository, use '.' as the path to diff --git a/tests/test-convert.out b/tests/test-convert.out --- a/tests/test-convert.out +++ b/tests/test-convert.out @@ -3,6 +3,7 @@ hg convert [OPTION]... SOURCE [DEST [MAP Convert a foreign SCM repository to a Mercurial one. Accepted source formats: + - Mercurial - CVS - Darcs - git @@ -19,8 +20,8 @@ Convert a foreign SCM repository to a Me basename of the source with '-hg' appended. If the destination repository doesn't exist, it will be created. - If isn't given, it will be put in a default location - (/.hg/shamap by default). The is a simple text + If isn't given, it will be put in a default location + (/.hg/shamap by default). The is a simple text file that maps each source commit ID to the destination ID for that revision, like so: @@ -46,11 +47,12 @@ Convert a foreign SCM repository to a Me rename from/file to/file The 'include' directive causes a file, or all files under a - directory, to be included in the destination repository. The - 'exclude' directive causes files or directories to be omitted. - The 'rename' directive renames a file or directory. To rename - from a subdirectory into the root of the repository, use '.' as - the path to rename to. + directory, to be included in the destination repository, and the + exclusion of all other files and dirs not explicitely included. + The 'exclude' directive causes files or directories to be omitted. + The 'rename' directive renames a file or directory. To rename from a + subdirectory into the root of the repository, use '.' as the path to + rename to. options: