changeset 48746 | 18e69f224e4b |
parent 48716 | f1eb77dceb36 |
child 48757 | af9f2c64302e |
--- a/mercurial/merge.py Fri Jan 21 17:54:03 2022 +0100 +++ b/mercurial/merge.py Thu Feb 03 18:14:25 2022 +0100 @@ -519,10 +519,7 @@ elif action[0].no_op: mresult.removefile(f) # merge does not affect file elif action[0].narrow_safe: - if ( - not f.endswith(b'/') - and action[0].changes == mergestatemod.CHANGE_MODIFIED - ): + if not f.endswith(b'/'): mresult.removefile(f) # merge won't affect on-disk files mresult.addcommitinfo(