diff -r ae7bc658a208 -r 7fb7a32336a2 hg.rst --- a/hg.rst Wed Nov 19 21:39:14 2014 +0200 +++ b/hg.rst Tue Nov 25 19:24:23 2014 +0200 @@ -131,7 +131,7 @@ ----------------- :: - $ hg conver --branchmap $branchmapfile oldrepo newrepo + $ hg convert --branchmap $branchmapfile oldrepo newrepo To convert non-ASCII names use UTF-8 coding for 'branchmap' file. @@ -139,8 +139,8 @@ separator between old branch name and new, so new branch name can not contain spaces. -Join history of two repos. -========================== +Joining history of two repos. +============================= :: $ cat >filemap1.txt <