Mercurial > hg
comparison mercurial/ui.py @ 38858:e9740c07158d
resolve: add commands.resolve.mark-check=abort to tweakdefaults
Differential Revision: https://phab.mercurial-scm.org/D4072
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Fri, 03 Aug 2018 12:59:01 -0700 |
| parents | afc4ad706f9c |
| children | 6f38284b23f4 |
comparison
equal
deleted
inserted
replaced
| 38857:96d0795bd0bd | 38858:e9740c07158d |
|---|---|
| 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 | |
| 70 | 73 |
| 71 [diff] | 74 [diff] |
| 72 git = 1 | 75 git = 1 |
| 73 showfunc = 1 | 76 showfunc = 1 |
| 74 word-diff = 1 | 77 word-diff = 1 |