Mercurial > hg

diff tests/test-help.t @ 34915:cab34bda259e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: fix typo in hg merge documentation
author Joe Blaylock <jrbl@google.com>
date Fri, 20 Oct 2017 14:15:46 -0700
parents da07367d683b
children fd78276948b4
line wrap: on
line diff
--- 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"