--- a/mercurial/merge.py Fri Sep 25 13:58:05 2020 +0530
+++ b/mercurial/merge.py Thu Sep 03 13:44:06 2020 +0530
@@ -909,6 +909,10 @@
(f, None, f, False, pa.node()),
b'prompt changed/deleted',
)
+ if branchmerge:
+ mresult.addcommitinfo(
+ f, b'merge-removal-candidate', b'yes'
+ )
elif n1 == addednodeid:
# This file was locally added. We should forget it instead of
# deleting it.
@@ -1018,6 +1022,10 @@
(None, f, f, False, pa.node()),
b'prompt deleted/changed',
)
+ if branchmerge:
+ mresult.addcommitinfo(
+ f, b'merge-removal-candidate', b'yes'
+ )
else:
mresult.addfile(
f,