Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 48468:9dd151a39950 | 48469:a16eedf47843 |
|---|---|
| 1026 | 1026 |
| 1027 | 1027 |
| 1028 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): | 1028 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
| 1029 """perform a 3-way merge in the working directory | 1029 """perform a 3-way merge in the working directory |
| 1030 | 1030 |
| 1031 premerge = whether this is a premerge | |
| 1032 mynode = parent node before merge | 1031 mynode = parent node before merge |
| 1033 orig = original local filename before merge | 1032 orig = original local filename before merge |
| 1034 fco = other file context | 1033 fco = other file context |
| 1035 fca = ancestor file context | 1034 fca = ancestor file context |
| 1036 fcd = local file context for current/destination file | 1035 fcd = local file context for current/destination file |