Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: fix typo in hg merge documentation stable
authorJoe Blaylock <jrbl@google.com>
Fri, 20 Oct 2017 14:15:46 -0700
branchstable
changeset 34915 cab34bda259e
parent 34914 5539a6acfd77
child 34916 346781c41597
child 34949 f432e2064a74
help: fix typo in hg merge documentation
mercurial/filemerge.py file | annotate | diff | comparison | revisions
tests/test-help.t file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Fri Oct 20 13:44:38 2017 -0500
+++ b/mercurial/filemerge.py	Fri Oct 20 14:15:46 2017 -0700
@@ -459,7 +459,7 @@
     ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
     same directory as ``a.txt``.
 
-    This implies permerge. Therefore, files aren't dumped, if premerge
+    This implies premerge. Therefore, files aren't dumped, if premerge
     runs successfully. Use :forcedump to forcibly write files out.
     """
     a = _workingpath(repo, fcd)
--- a/tests/test-help.t	Fri Oct 20 13:44:38 2017 -0500
+++ b/tests/test-help.t	Fri Oct 20 14:15:46 2017 -0700
@@ -1792,7 +1792,7 @@
         accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
         they will be placed in the same directory as "a.txt".
   
-        This implies permerge. Therefore, files aren't dumped, if premerge runs
+        This implies premerge. Therefore, files aren't dumped, if premerge runs
         successfully. Use :forcedump to forcibly write files out.
   
       ":fail"
mercurial