Show More
@@ -245,8 +245,11 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
245 | 245 | ): |
|
246 | 246 | backup = ( |
|
247 | 247 | f in fileconflicts |
|
248 |
or |
|
|
249 | or any(p in pathconflicts for p in pathutil.finddirs(f)) | |
|
248 | or pathconflicts | |
|
249 | and ( | |
|
250 | f in pathconflicts | |
|
251 | or any(p in pathconflicts for p in pathutil.finddirs(f)) | |
|
252 | ) | |
|
250 | 253 | ) |
|
251 | 254 | (flags,) = args |
|
252 | 255 | mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg) |
General Comments 0
You need to be logged in to leave comments.
Login now