diff -r b42ce825308e -r 9c9cfecd4600 relnotes/next
--- a/relnotes/next	Fri Jan 10 14:17:56 2020 -0800
+++ b/relnotes/next	Fri Jan 10 14:22:20 2020 -0800
@@ -21,6 +21,11 @@
 
 == Backwards Compatibility Changes ==
 
+ * When `hg rebase` pauses for merge conflict resolution, the working
+   copy will no longer have the rebased node as a second parent. You
+   can use the new `conflictparents()` revset for finding the other
+   parent during a conflict.
+
 
 == Internal API Changes ==