Mercurial > hg
diff mercurial/help/config.txt @ 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 | 8b5f97ab5774 |
children | 96d0795bd0bd |
line wrap: on
line diff
--- a/mercurial/help/config.txt Tue Jul 17 23:34:55 2018 -0700 +++ b/mercurial/help/config.txt Tue Jul 31 19:11:17 2018 +0530 @@ -438,6 +438,11 @@ ``commands`` ------------ +``resolve.confirm`` + Confirm before re-merging all unresolved files when running + :hg:`resolve --all`. + (default: False) + ``status.relative`` Make paths in :hg:`status` output relative to the current directory. (default: False)