diff -r 09edbff6ae8d -r 49ffaa4f65f6 mercurial/merge.py --- a/mercurial/merge.py Mon Aug 24 15:20:09 2020 +0530 +++ b/mercurial/merge.py Mon Aug 24 17:22:28 2020 +0530 @@ -932,6 +932,14 @@ mresult.addfile( f, mergestatemod.ACTION_REMOVE, None, b'other deleted', ) + else: # file not in ancestor, not in remote + mresult.addfile( + f, + mergestatemod.ACTION_KEEP, + None, + b'ancestor missing, remote missing', + ) + elif n2: # file exists only on remote side if f in copied1: pass # we'll deal with it on m1 side