diff --git a/mercurial/ui.py b/mercurial/ui.py index da2e874fe582e467eebb1203e3282c7a4e7b8405_bWVyY3VyaWFsL3VpLnB5..8239d4e5d05f5452d66e4ae1ffc2f58e0d0fbd0d_bWVyY3VyaWFsL3VpLnB5 100644 --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -67,9 +67,6 @@ update.check = noconflict # Show conflicts information in `hg status` status.verbose = True -# Refuse to perform `hg resolve --mark` on files that still have conflict -# markers -resolve.mark-check = abort [diff] git = 1