--- a/hgext3rd/evolve/evolvecmd.py	Thu Jun 07 15:54:32 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Jun 07 20:27:03 2018 +0530
@@ -468,6 +468,8 @@
 
     # conflicts while merging content-divergent changesets
     if compat.hasconflict(stats):
+        tr = repo.currenttransaction()
+        tr.close()
         evolvestate.save()
         raise error.Abort(_("fix conflicts and run 'hg evolve --continue' or"
                             " use 'hg update -C .' to abort"))