Skip to content
Snippets Groups Projects
Commit bcdccdd48d99 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

changelog: move note about touch+merge (issue6416) to 10.3.3

It belongs there. I assume this note was at some point merged into 10.3.2 by
mistake during a rebase because the MR is quite old.
parent c8a75487cb1c
No related branches found
No related tags found
2 merge requests!38910.4.0: merge stable to default,!38710.4.0: compatibility branches
Pipeline #39253 passed
......@@ -10,7 +10,10 @@
* evolve: compatibility with Mercurial 5.9
* fold: make sure to save commit messages in last-message.txt, also affects
metaedit (issue6549)
* touch: fix `hg touch` on merge commits
* touch/fold/metaedit/rewind: no longer lose changes from merge commits
(issue6416). As a consequence (for technical reasons), when run with
Mercurial 5.5 and earlier, these commands now require there to be no
unresolved conflicts.
topic (0.22.3)
......@@ -23,11 +26,6 @@
* next: remove duplicated targets when updating from an unstable changeset
* evolve: use "served" repo filter to guess what the server will publish
* touch/fold/metaedit/rewind: no longer lose changes from merge commits
(issue6416). As a consequence (for technical reasons), when run with
Mercurial 5.5 and earlier, these commands now require there to be no
unresolved conflicts.
topic (0.22.2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment