Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 38857:96d0795bd0bd
resolve: graduate resolve.mark-check from experimental, add docs
Since this hasn't been in a release yet, I'm not bothering to add an alias for
the experimental name of the config variable.
Differential Revision: https://phab.mercurial-scm.org/D4071
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Fri, 03 Aug 2018 12:57:44 -0700 |
| parents | 7848f284b211 |
| children | 7e75777e4a51 |
comparison
equal
deleted
inserted
replaced
| 38856:a01200b25da6 | 38857:96d0795bd0bd |
|---|---|
| 191 default=False, | 191 default=False, |
| 192 ) | 192 ) |
| 193 coreconfigitem('commands', 'resolve.confirm', | 193 coreconfigitem('commands', 'resolve.confirm', |
| 194 default=False, | 194 default=False, |
| 195 ) | 195 ) |
| 196 coreconfigitem('commands', 'resolve.mark-check', | |
| 197 default=None, | |
| 198 ) | |
| 196 coreconfigitem('commands', 'show.aliasprefix', | 199 coreconfigitem('commands', 'show.aliasprefix', |
| 197 default=list, | 200 default=list, |
| 198 ) | 201 ) |
| 199 coreconfigitem('commands', 'status.relative', | 202 coreconfigitem('commands', 'status.relative', |
| 200 default=False, | 203 default=False, |
| 937 default=False, | 940 default=False, |
| 938 ) | 941 ) |
| 939 coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', | 942 coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', |
| 940 default=True, | 943 default=True, |
| 941 alias=[('format', 'aggressivemergedeltas')], | 944 alias=[('format', 'aggressivemergedeltas')], |
| 942 ) | |
| 943 coreconfigitem('experimental', 'resolve.mark-check', | |
| 944 default=None, | |
| 945 ) | 945 ) |
| 946 coreconfigitem('server', 'bookmarks-pushkey-compat', | 946 coreconfigitem('server', 'bookmarks-pushkey-compat', |
| 947 default=True, | 947 default=True, |
| 948 ) | 948 ) |
| 949 coreconfigitem('server', 'bundle1', | 949 coreconfigitem('server', 'bundle1', |