Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 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 18a3274ed675
children 5caae380ff90
line wrap: on
line diff
--- 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)