Patchwork D11925: filemerge: remove leftover documentation of removed argument

login
register
mail settings
Submitter phabricator
Date Dec. 14, 2021, 9:43 p.m.
Message ID <differential-rev-PHID-DREV-2dpjc2y7a34huwfuqezj-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50251/
State New
Headers show

Comments

phabricator - Dec. 14, 2021, 9:43 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I removed the `premerge` argument in
  https://phab.mercurial-scm.org/D11859.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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