--- 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)