changeset 34522 | bed1d2eaa108 |
parent 34521 | aacb17cc0ee4 |
child 34523 | 486dbd6afa57 |
--- a/mercurial/configitems.py Sun Oct 08 21:47:14 2017 +0200 +++ b/mercurial/configitems.py Sun Oct 08 21:48:40 2017 +0200 @@ -344,6 +344,12 @@ coreconfigitem('http_proxy', 'user', default=None, ) +coreconfigitem('merge', 'checkunknown', + default='abort', +) +coreconfigitem('merge', 'checkignored', + default='abort', +) coreconfigitem('merge', 'followcopies', default=True, )