mercurial/merge.py
changeset 45468 09edbff6ae8d
parent 45467 bb9888d32601
child 45469 49ffaa4f65f6
--- a/mercurial/merge.py	Tue Sep 01 17:08:26 2020 +0530
+++ b/mercurial/merge.py	Mon Aug 24 15:20:09 2020 +0530
@@ -1023,6 +1023,13 @@
                         (None, f, f, False, pa.node()),
                         b'prompt deleted/changed',
                     )
+            else:
+                mresult.addfile(
+                    f,
+                    mergestatemod.ACTION_KEEP_ABSENT,
+                    None,
+                    b'local not present, remote unchanged',
+                )
 
     if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'):
         # If we are merging, look for path conflicts.