Mercurial > hg
comparison mercurial/configitems.py @ 38741:e90130af47ce stable 4.7rc0
configitems: restore alias for format.aggressivemergedeltas
913ca175c4ae broke BC by dropping support for reading
format.aggressivemergedeltas. Let's restore it.
Differential Revision: https://phab.mercurial-scm.org/D3966
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 19 Jul 2018 11:10:48 -0700 |
parents | 913ca175c4ae |
children | ae17555ef93f |
comparison
equal
deleted
inserted
replaced
38740:c08ea1e219c0 | 38741:e90130af47ce |
---|---|
927 coreconfigitem('push', 'pushvars.server', | 927 coreconfigitem('push', 'pushvars.server', |
928 default=False, | 928 default=False, |
929 ) | 929 ) |
930 coreconfigitem('revlog', 'optimize-delta-parent-choice', | 930 coreconfigitem('revlog', 'optimize-delta-parent-choice', |
931 default=True, | 931 default=True, |
932 # formely an experimental option: format.aggressivemergedeltas | 932 alias=[('format', 'aggressivemergedeltas')], |
933 ) | 933 ) |
934 coreconfigitem('server', 'bookmarks-pushkey-compat', | 934 coreconfigitem('server', 'bookmarks-pushkey-compat', |
935 default=True, | 935 default=True, |
936 ) | 936 ) |
937 coreconfigitem('server', 'bundle1', | 937 coreconfigitem('server', 'bundle1', |