Mercurial > hg

changeset 48469:a16eedf47843

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: remove leftover documentation of removed argument I removed the `premerge` argument in https://phab.mercurial-scm.org/D11859. Differential Revision: https://phab.mercurial-scm.org/D11925
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 14 Dec 2021 13:41:34 -0800
parents 9dd151a39950
children 3eb3aef6d3bf
files mercurial/filemerge.py
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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