Mercurial > hg
view mercurial/helptext/deprecated.txt @ 46139:3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
This adds support for the new "mergediff" conflict marker style to
"merge-tools.<tool>.premerge" (the new value is called
"keep-mergediff").
Differential Revision: https://phab.mercurial-scm.org/D9606
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 14 Dec 2020 18:09:37 -0800 |
| parents | 2e017696181f |
| children |
line wrap: on
line source
Mercurial evolves over time, some features, options, commands may be replaced by better and more secure alternatives. This topic will help you migrating your existing usage and/or configuration to newer features. Commands ======== The following commands are still available but their use are not recommended: ``locate`` This command has been replaced by `hg files`. ``parents`` This command can be replaced by `hg summary` or `hg log` with appropriate revsets. See `hg help revsets` for more information. ``tip`` The recommended alternative is `hg heads`. Options ======= ``web.allowpull`` Renamed to `allow-pull`. ``web.allow_push`` Renamed to `allow-push`.