comparison mercurial/configitems.py @ 34522:bed1d2eaa108

configitems: register 'merge.checkunknown' and 'merge.checkignored'

They both use the same function defining a default, so we need to update them at
the same time.

34521:aacb17cc0ee4

    default=None,
)
coreconfigitem('http_proxy', 'user',
    default=None,
)
coreconfigitem('merge', 'followcopies',
    default=True,
)
coreconfigitem('merge', 'preferancestor',
        default=lambda: ['*'],

34522:bed1d2eaa108

    default=None,
)
coreconfigitem('http_proxy', 'user',
    default=None,
)
coreconfigitem('merge', 'checkunknown',
    default='abort',
)
coreconfigitem('merge', 'checkignored',
    default='abort',
)
coreconfigitem('merge', 'followcopies',
    default=True,
)
coreconfigitem('merge', 'preferancestor',
        default=lambda: ['*'],