Mercurial > public > mercurial-scm > hg-stable
diff mercurial/configitems.py @ 38862: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
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Tue, 31 Jul 2018 19:11:17 +0530 |
parents | 6c8e3c847977 |
children | 503f936489dd |
line wrap: on
line diff
--- a/mercurial/configitems.py Tue Jul 17 23:34:55 2018 -0700 +++ b/mercurial/configitems.py Tue Jul 31 19:11:17 2018 +0530 @@ -190,6 +190,9 @@ coreconfigitem('commands', 'grep.all-files', default=False, ) +coreconfigitem('commands', 'resolve.confirm', + default=False, +) coreconfigitem('commands', 'show.aliasprefix', default=list, )