Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 38239:ead71b15efd5
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 06 Jun 2018 13:31:24 -0400 |
parents | ee1f052b45ef 8c828beb7543 |
children | 15a1e37f80bd |
comparison
equal
deleted
inserted
replaced
38238:2b8c8b8d1a06 | 38239:ead71b15efd5 |
---|---|
1126 default=True, | 1126 default=True, |
1127 ) | 1127 ) |
1128 coreconfigitem('ui', 'rollback', | 1128 coreconfigitem('ui', 'rollback', |
1129 default=True, | 1129 default=True, |
1130 ) | 1130 ) |
1131 coreconfigitem('ui', 'signal-safe-lock', | |
1132 default=True, | |
1133 ) | |
1131 coreconfigitem('ui', 'slash', | 1134 coreconfigitem('ui', 'slash', |
1132 default=False, | 1135 default=False, |
1133 ) | 1136 ) |
1134 coreconfigitem('ui', 'ssh', | 1137 coreconfigitem('ui', 'ssh', |
1135 default='ssh', | 1138 default='ssh', |