changeset 49889 | 3aa8e569478a |
parent 49886 | becd16690cbe |
child 49892 | c7624b1ac8b4 |
--- a/mercurial/merge.py Fri Jan 06 16:27:31 2023 +0000 +++ b/mercurial/merge.py Wed Jan 04 19:13:41 2023 +0000 @@ -245,8 +245,11 @@ ): backup = ( f in fileconflicts - or f in pathconflicts - or any(p in pathconflicts for p in pathutil.finddirs(f)) + or pathconflicts + and ( + f in pathconflicts + or any(p in pathconflicts for p in pathutil.finddirs(f)) + ) ) (flags,) = args mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg)