Mercurial > public > mercurial-scm > hg
diff mercurial/filemerge.py @ 48469:a16eedf47843
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 | 0994125a31e5 |
| children | da38519cbd10 |
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