Mercurial > hg

changeset 44392:efd73cdcfbac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relnotes: move entry to the right spot It appears a conflict resolution went wrong. Differential Revision: https://phab.mercurial-scm.org/D8151
author Valentin Gatien-Baron <vgatien-baron@janestreet.com>
date Wed, 26 Feb 2020 10:56:27 -0500
parents a6fb134bd086
children adb93aa98c78
files relnotes/next
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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