# HG changeset patch
# User Valentin Gatien-Baron <vgatien-baron@janestreet.com>
# Date 1582732587 18000
# 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 -r a6fb134bd086 -r efd73cdcfbac relnotes/next
--- a/relnotes/next	Wed Feb 26 17:16:25 2020 +0100
+++ b/relnotes/next	Wed Feb 26 10:56:27 2020 -0500
@@ -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