Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
evolve
Commits
44dd0e2a28bf
Commit
44dd0e2a
authored
Mar 04, 2021
by
Anton Shestakov
Browse files
changelog: move a recently added feature to the correct release
parent
307a9e8489f2
Pipeline
#18803
passed with stage
in 6 minutes and 47 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
44dd0e2a
...
...
@@ -7,6 +7,7 @@
* evolve: add a experimental.evolution.in-memory config for running evolve
in memory
* evolve: improve content-divergence resolution that involves parent changes
* evolve: preserve wdir parent when using `hg evolve --stop`
* obslog: clarify the command name in the help,
* pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff`
and `hg status` respectively
...
...
@@ -66,7 +67,6 @@
* evolve: while resolving conflicts, the evolved node will no longer be a
dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
but it will show up as `%` with hg >= 5.4)
* evolve: preserve wdir parent when using `hg evolve --stop`
* metaedit: update bookmark location when applicable
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment