diff -r 1d2d353e5c4a -r b7808443ed6a relnotes/next --- a/relnotes/next Mon May 18 12:45:45 2020 -0400 +++ b/relnotes/next Mon May 18 14:59:59 2020 -0400 @@ -11,3 +11,6 @@ * logcmdutil.diffordiffstat() now takes contexts instead of nodes. + * The `mergestate` class along with some related methods and constants have + moved from `mercurial.merge` to a new `mercurial.mergestate` module. +