equal
deleted
inserted
replaced
4606 |
4606 |
4607 tocomplete = [] |
4607 tocomplete = [] |
4608 hasconflictmarkers = [] |
4608 hasconflictmarkers = [] |
4609 if mark: |
4609 if mark: |
4610 markcheck = ui.config('commands', 'resolve.mark-check') |
4610 markcheck = ui.config('commands', 'resolve.mark-check') |
|
4611 if markcheck not in ['warn', 'abort']: |
|
4612 # Treat all invalid / unrecognized values as 'none'. |
|
4613 markcheck = False |
4611 for f in ms: |
4614 for f in ms: |
4612 if not m(f): |
4615 if not m(f): |
4613 continue |
4616 continue |
4614 |
4617 |
4615 didwork = True |
4618 didwork = True |