changeset 40578 | db61a18148a4 |
parent 40547 | 840cd57cde32 |
parent 40473 | 8239d4e5d05f |
child 40587 | 5542bc9125c9 |
--- a/mercurial/ui.py Fri Nov 09 10:47:24 2018 -0800 +++ b/mercurial/ui.py Sat Nov 10 12:07:26 2018 +0900 @@ -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