# HG changeset patch # User Joe Blaylock <jrbl@google.com> # Date 1508534146 25200 # Fri Oct 20 14:15:46 2017 -0700 # Branch stable # Node ID cab34bda259e6a604e9d0575cabe568baab28e0f # Parent 5539a6acfd77d4f3117c5944efce53b293b05b6a help: fix typo in hg merge documentation diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -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) diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -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"