| changeset 38857 | 96d0795bd0bd |
| parent 38822 | f8732e33bcbc |
| child 38859 | db03e5cefc82 |
| 38856:a01200b25da6 | 38857:96d0795bd0bd |
|---|---|
4601 runconclude = False |
4601 runconclude = False |
4602 |
4602 |
4603 tocomplete = [] |
4603 tocomplete = [] |
4604 hasconflictmarkers = [] |
4604 hasconflictmarkers = [] |
4605 if mark: |
4605 if mark: |
4606 markcheck = ui.config('experimental', 'resolve.mark-check') |
4606 markcheck = ui.config('commands', 'resolve.mark-check') |
4607 for f in ms: |
4607 for f in ms: |
4608 if not m(f): |
4608 if not m(f): |
4609 continue |
4609 continue |
4610 |
4610 |
4611 didwork = True |
4611 didwork = True |