comparison mercurial/configitems.py @ 38822:f8732e33bcbc

resolve: add confirm config option

This config setting gives a functionality to confirm before
it re-merge all unresolved files. If this config is enabled,
when you run 'hg resolve --all' it will prompt with a msg
"re-merge all unresolved files (yn)?"

To enable this functionality:
[commands]
resolve.confirm = True

Differential Revision: https://phab.mercurial-scm.org/D3988

38821:d814bbd22946

    default=dynamicdefault,
)
coreconfigitem('commands', 'grep.all-files',
    default=False,
)
coreconfigitem('commands', 'show.aliasprefix',
    default=list,
)
coreconfigitem('commands', 'status.relative',
    default=False,

38822:f8732e33bcbc

    default=dynamicdefault,
)
coreconfigitem('commands', 'grep.all-files',
    default=False,
)
coreconfigitem('commands', 'resolve.confirm',
    default=False,
)
coreconfigitem('commands', 'show.aliasprefix',
    default=list,
)
coreconfigitem('commands', 'status.relative',
    default=False,