diff -r 3d409f4ff46b -r 818b4f19ef23 mercurial/mergestate.py
--- a/mercurial/mergestate.py	Sat Jun 06 19:15:11 2020 +0800
+++ b/mercurial/mergestate.py	Fri Jun 05 11:10:33 2020 -0700
@@ -769,8 +769,7 @@
 
     # resolve path conflicts
     for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []):
-        (f0,) = args
-        origf0 = repo.dirstate.copied(f0) or f0
+        (f0, origf0) = args
         repo.dirstate.add(f)
         repo.dirstate.copy(origf0, f)
         if f0 == origf0: