--- a/mercurial/merge.py	Mon Aug 10 15:38:45 2020 +0530
+++ b/mercurial/merge.py	Mon Aug 10 15:47:21 2020 +0530
@@ -1367,8 +1367,7 @@
     for f, op in pycompat.iteritems(mresult.commitinfo):
         # the other side of filenode was choosen while merging, store this in
         # mergestate so that it can be reused on commit
-        if op[b'filenode-source'] == b'other':
-            ms.addmergedother(f)
+        ms.addcommitinfo(f, op)
 
     moves = []