mercurial/filemerge.py
changeset 48469 a16eedf47843
parent 48433 0994125a31e5
child 48503 da38519cbd10
--- a/mercurial/filemerge.py	Mon Dec 13 14:44:16 2021 -0500
+++ b/mercurial/filemerge.py	Tue Dec 14 13:41:34 2021 -0800
@@ -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