Mercurial > hg
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
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Tue, 31 Jul 2018 19:11:17 +0530 |
parents | 6c8e3c847977 |
children | 503f936489dd |
comparison
equal
deleted
inserted
replaced
38821:d814bbd22946 | 38822:f8732e33bcbc |
---|---|
188 default=dynamicdefault, | 188 default=dynamicdefault, |
189 ) | 189 ) |
190 coreconfigitem('commands', 'grep.all-files', | 190 coreconfigitem('commands', 'grep.all-files', |
191 default=False, | 191 default=False, |
192 ) | 192 ) |
193 coreconfigitem('commands', 'resolve.confirm', | |
194 default=False, | |
195 ) | |
193 coreconfigitem('commands', 'show.aliasprefix', | 196 coreconfigitem('commands', 'show.aliasprefix', |
194 default=list, | 197 default=list, |
195 ) | 198 ) |
196 coreconfigitem('commands', 'status.relative', | 199 coreconfigitem('commands', 'status.relative', |
197 default=False, | 200 default=False, |