[Updated] D11925: filemerge: remove leftover documentation of removed argument

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHGa16eedf47843: filemerge: remove leftover documentation of removed argument (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11925?vs=31482&id=31488

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11925/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11925

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -1028,7 +1028,6 @@
 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
     """perform a 3-way merge in the working directory
 
-    premerge = whether this is a premerge
     mynode = parent node before merge
     orig = original local filename before merge
     fco = other file context



To: martinvonz, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211215/1971aa3c/attachment-0002.html>