Commit 44dd0e2a authored by Anton Shestakov's avatar 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
......@@ -7,6 +7,7 @@
* evolve: add a 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment