Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 38857:96d0795bd0bd
resolve: graduate resolve.mark-check from experimental, add docs
Since this hasn't been in a release yet, I'm not bothering to add an alias for
the experimental name of the config variable.
Differential Revision: https://phab.mercurial-scm.org/D4071
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Fri, 03 Aug 2018 12:57:44 -0700 |
| parents | f8732e33bcbc |
| children | db03e5cefc82 |
comparison
equal
deleted
inserted
replaced
| 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 |