diff -r ed58ecd59030 -r e05a488cbed0 mercurial/merge.py
--- a/mercurial/merge.py	Sat Jul 18 12:35:55 2020 +0200
+++ b/mercurial/merge.py	Thu Jul 09 14:44:58 2020 +0530
@@ -1264,7 +1264,7 @@
         else:
             s(_(b"the remote file has been renamed to %s\n") % f1)
         s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f)
-        ms.addpath(f, f1, fo)
+        ms.addpathconflict(f, f1, fo)
         progress.increment(item=f)
 
     # When merging in-memory, we can't support worker processes, so set the