--- a/mercurial/merge.py	Fri Jul 24 18:16:29 2020 +0530
+++ b/mercurial/merge.py	Fri Jul 24 19:13:20 2020 +0530
@@ -1133,9 +1133,9 @@
     prunedactions = sparse.filterupdatesactions(
         repo, wctx, mctx, branchmerge, mresult.actions
     )
+    mresult.setactions(prunedactions)
     _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
 
-    mresult.setactions(prunedactions)
     return mresult