Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help/config.txt @ 39420:56469d475341
resolve: add config to make hg resolve not re-merge by default
Before this, calling 'hg resolve' with neither -m, -u or -l will
re-merge. This is highly error prone (it's easy to forget to forget a
-m), and pretty bad when it happens (many people have no idea 'hg
resolve' can re-merge, and end up redoing the work of resolving all
the conflicts, because they have no idea there was a backup of their
work).
Differential Revision: https://phab.mercurial-scm.org/D4379
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2018 16:42:28 -0400 |
| parents | cded904f7acc |
| children | d0a8299e7256 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sun Aug 26 15:52:34 2018 -0400 +++ b/mercurial/help/config.txt Sun Aug 26 16:42:28 2018 -0400 @@ -442,6 +442,11 @@ Confirm before performing action if no filename is passed. (default: False) +``resolve.explicit-re-merge`` + Require uses of ``hg resolve`` to specify which action it should perform, + instead of re-merging files by default. + (default: False) + ``resolve.mark-check`` Determines what level of checking :hg:`resolve --mark` will perform before marking files as resolved. Valid values are ``none`, ``warn``, and