Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/ui.py @ 42564:44e99811bea7
tweakdefaults: make hg resolve require --re-merge flag to re-merge
Pulkit suggested it in https://phab.mercurial-scm.org/D4379, and a
discussion with Octobus people reminded me that people still use the
error-prone default behavior of `hg resolve`.
Differential Revision: https://phab.mercurial-scm.org/D6610
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sat, 06 Jul 2019 19:55:29 -0400 |
| parents | 3de4f17f4824 |
| children | 51a2e3102db2 |
comparison
equal
deleted
inserted
replaced
| 42563:70f1a84d0794 | 42564:44e99811bea7 |
|---|---|
| 66 grep.all-files = True | 66 grep.all-files = True |
| 67 # Refuse to perform an `hg update` that would cause a file content merge | 67 # Refuse to perform an `hg update` that would cause a file content merge |
| 68 update.check = noconflict | 68 update.check = noconflict |
| 69 # Show conflicts information in `hg status` | 69 # Show conflicts information in `hg status` |
| 70 status.verbose = True | 70 status.verbose = True |
| 71 # Make `hg resolve` with no action (like `-m`) fail instead of re-merging. | |
| 72 resolve.explicit-re-merge = True | |
| 71 | 73 |
| 72 [diff] | 74 [diff] |
| 73 git = 1 | 75 git = 1 |
| 74 showfunc = 1 | 76 showfunc = 1 |
| 75 word-diff = 1 | 77 word-diff = 1 |