diff -r f69d8c25eeb7 -r b9e8a47c4d5c README
--- a/README	Thu Feb 11 00:02:39 2016 +0000
+++ b/README	Thu Feb 11 00:35:16 2016 +0000
@@ -66,6 +66,9 @@
 - evolve: prevent added file to be marked as unknown if evolve fails (issue4966)
 - evolve: stop relying on graftstate file for save evolve state
           (for `hg evolve --continue`)
+- evolve: fix divergence resolution when it result in an empty commit
+          (issue4950) (hg-3.5+ only)
+
 
 5.2.2 --