relnotes/next

--- a/relnotes/next	Wed Mar 04 00:45:54 2020 -0500
+++ b/relnotes/next	Fri Feb 28 11:32:02 2020 -0800
@@ -61,6 +61,9 @@
  * `hg debugmergestate` output format changed. Let us know if that is
    causing you problems and we'll roll it back.
 
+ * Resolved merge conflicts are now cleared by `hg commit` even if the
+   working copy has no changes.
+
 
 == Internal API Changes ==