# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1521657051 -3600
# Node ID 3a4552b30ba8dd4cc7b7381265ea79f29261dbc6
# Parent  10c3e69bb5bfb892fddbc31f21c99ae8f1d574cc
compat: use mergetoolopts from commands.py

Mercurial <= 4.2 do not have cmdutils.py yet.

diff -r 10c3e69bb5bf -r 3a4552b30ba8 hgext3rd/evolve/evolvecmd.py
--- 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):