From patchwork Fri Oct 20 22:52:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: hg: fix typo in hg merge documentation From: via Mercurial-devel X-Patchwork-Id: 25266 Message-Id: To: mercurial-devel@mercurial-scm.org Cc: Joe Blaylock Date: Fri, 20 Oct 2017 15:52:48 -0700 # HG changeset patch # User Joe Blaylock # Date 1508534146 25200 # Fri Oct 20 14:15:46 2017 -0700 # Branch stable # Node ID c89ef6ec5755c240883efc765a9b1802ba312ce7 # Parent 5539a6acfd77d4f3117c5944efce53b293b05b6a hg: 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"