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).
Details
Details
- Reviewers
- None
- Group Reviewers
hg-reviewers - Commits
- rHG56469d475341: resolve: add config to make hg resolve not re-merge by default
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
I like the feature it introduces. Thanks for coding this up. This looks like a good candidate for ui.tweakdefaults, @durin42 what do you think?
I think I’m generally fine with that.
ui.configbool() is better. Can you followup?