Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 44092 833210fbd900
parent 44090 2f0a44c69e07
child 44150 ff22c76825b9 
--- a/mercurial/merge.py	Fri Dec 27 15:14:19 2019 -0800
+++ b/mercurial/merge.py	Fri Dec 27 13:47:59 2019 -0800
@@ -2635,7 +2635,7 @@
         repo.setparents(pctx.node(), pother)
         repo.dirstate.write(repo.currenttransaction())
         # fix up dirstate for copies and renames
-        copies.graftcopies(repo, wctx, ctx, base)
+        copies.graftcopies(wctx, ctx, base)
     return stats
mercurial