Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/ui.py @ 40432:8239d4e5d05f stable
tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken
See issue6020 for the current case. I don't want to continue attempting to fix
this on the stable branch, so I'm removing from tweakdefaults and will send
fixes meant for the default branch and 4.9.
Differential Revision: https://phab.mercurial-scm.org/D5225
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Mon, 05 Nov 2018 15:01:45 -0800 |
| parents | 0d403e9f049a |
| children | db61a18148a4 |
comparison
equal
deleted
inserted
replaced
| 40431:da2e874fe582 | 40432:8239d4e5d05f |
|---|---|
| 65 status.relative = yes | 65 status.relative = yes |
| 66 # Refuse to perform an `hg update` that would cause a file content merge | 66 # Refuse to perform an `hg update` that would cause a file content merge |
| 67 update.check = noconflict | 67 update.check = noconflict |
| 68 # Show conflicts information in `hg status` | 68 # Show conflicts information in `hg status` |
| 69 status.verbose = True | 69 status.verbose = True |
| 70 # Refuse to perform `hg resolve --mark` on files that still have conflict | |
| 71 # markers | |
| 72 resolve.mark-check = abort | |
| 73 | 70 |
| 74 [diff] | 71 [diff] |
| 75 git = 1 | 72 git = 1 |
| 76 showfunc = 1 | 73 showfunc = 1 |
| 77 word-diff = 1 | 74 word-diff = 1 |