changeset 38896 | 96d0795bd0bd |
parent 38862 | f8732e33bcbc |
child 38898 | db03e5cefc82 |
--- a/mercurial/commands.py Mon Apr 16 23:49:38 2018 -0700 +++ b/mercurial/commands.py Fri Aug 03 12:57:44 2018 -0700 @@ -4603,7 +4603,7 @@ tocomplete = [] hasconflictmarkers = [] if mark: - markcheck = ui.config('experimental', 'resolve.mark-check') + markcheck = ui.config('commands', 'resolve.mark-check') for f in ms: if not m(f): continue