Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 43873:8caec25f5d8f
merge: add commands.merge.require-rev to require an argument to hg merge
This is related to commands.rebase.requiredest, commands.update.requiredest, and
commands.push.require-revs. Since it isn't really a "destination", I went with
require-rev to be similar to push's require-revs.
Differential Revision: https://phab.mercurial-scm.org/D7620
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Wed, 11 Dec 2019 19:42:05 -0800 |
| parents | acbb55b8e9dc |
| children | 8042856c90b6 |
comparison
equal
deleted
inserted
replaced
| 43872:527eba3013ea | 43873:8caec25f5d8f |
|---|---|
| 226 ) | 226 ) |
| 227 coreconfigitem( | 227 coreconfigitem( |
| 228 b'commands', b'grep.all-files', default=False, experimental=True, | 228 b'commands', b'grep.all-files', default=False, experimental=True, |
| 229 ) | 229 ) |
| 230 coreconfigitem( | 230 coreconfigitem( |
| 231 b'commands', b'merge.require-rev', default=False, | |
| 232 ) | |
| 233 coreconfigitem( | |
| 231 b'commands', b'push.require-revs', default=False, | 234 b'commands', b'push.require-revs', default=False, |
| 232 ) | 235 ) |
| 233 coreconfigitem( | 236 coreconfigitem( |
| 234 b'commands', b'resolve.confirm', default=False, | 237 b'commands', b'resolve.confirm', default=False, |
| 235 ) | 238 ) |