# HG changeset patch # User Valentin Gatien-Baron # Date 2020-02-26 15:56:27 # Node ID efd73cdcfbac70aa9e703db9cc3713db26272bf6 # Parent a6fb134bd086390a2d0399072f4c9cac68cb9cf3 relnotes: move entry to the right spot It appears a conflict resolution went wrong. Differential Revision: https://phab.mercurial-scm.org/D8151 diff --git a/relnotes/next b/relnotes/next --- a/relnotes/next +++ b/relnotes/next @@ -33,12 +33,12 @@ * Use `hg copy --forget --at-rev REV` to unmark already committed copies. - * prevent pushes of divergent bookmarks (foo@remote) - == Bug Fixes == * Fix server exception when concurrent pushes delete the same bookmark + * Prevent pushes of divergent bookmarks (foo@remote) + == Backwards Compatibility Changes == * When `hg rebase` pauses for merge conflict resolution, the working