relnotes/next

--- a/relnotes/next	Fri Jan 10 17:46:10 2020 -0800
+++ b/relnotes/next	Wed Jan 29 11:30:35 2020 -0800
@@ -3,6 +3,11 @@
  * `hg purge`/`hg clean` can now delete ignored files instead of
    untracked files, with the new -i flag.
 
+ * New `conflictlocal()` and `conflictother()` revsets returns the
+   commits that are being merged, when there are conflicts. Also works
+   for conflicts caused by e.g. `hg graft`.
+
+
 == New Experimental Features ==