Show More
@@ -475,7 +475,7 b' class mergestate(object):' | |||
|
475 | 475 | flo = fco.flags() |
|
476 | 476 | fla = fca.flags() |
|
477 | 477 | if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: |
|
478 | if fca.node() == nullid: | |
|
478 | if fca.node() == nullid and flags != flo: | |
|
479 | 479 | if preresolve: |
|
480 | 480 | self._repo.ui.warn( |
|
481 | 481 | _('warning: cannot merge flags for %s\n') % afile) |
@@ -337,7 +337,6 b' h: l vs l, different' | |||
|
337 | 337 | merging a |
|
338 | 338 | warning: cannot merge flags for b |
|
339 | 339 | merging b |
|
340 | warning: cannot merge flags for bx | |
|
341 | 340 | merging bx |
|
342 | 341 | warning: cannot merge flags for c |
|
343 | 342 | merging d |
@@ -400,7 +399,6 b' h: l vs l, different' | |||
|
400 | 399 | merging a |
|
401 | 400 | warning: cannot merge flags for b |
|
402 | 401 | merging b |
|
403 | warning: cannot merge flags for bx | |
|
404 | 402 | merging bx |
|
405 | 403 | warning: cannot merge flags for c |
|
406 | 404 | merging d |
General Comments 0
You need to be logged in to leave comments.
Login now