--- a/hgext3rd/evolve/evolvecmd.py	Wed Mar 21 15:24:51 2018 +0100
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Mar 21 19:30:51 2018 +0100
@@ -14,6 +14,7 @@
 from mercurial import (
     bookmarks as bookmarksmod,
     cmdutil,
+    commands,
     context,
     copies,
     error,
@@ -45,7 +46,7 @@
 
 eh = exthelper.exthelper()
 _bookmarksupdater = rewriteutil.bookmarksupdater
-mergetoolopts = cmdutil.mergetoolopts
+mergetoolopts = commands.mergetoolopts
 
 def _solveone(ui, repo, ctx, evolvestate, dryrun, confirm,
               progresscb, category):