# HG changeset patch # User Martin von Zweigbergk # Date 1639518094 28800 # Node ID a16eedf47843746f05026ca215fb459774eed89e # Parent 9dd151a39950206f60b2e5918b45284093991311 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 diff -r 9dd151a39950 -r a16eedf47843 mercurial/filemerge.py --- 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