Mercurial > evolve

changeset 3579:3a4552b30ba8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: use mergetoolopts from commands.py Mercurial <= 4.2 do not have cmdutils.py yet.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 19:30:51 +0100
parents 10c3e69bb5bf
children 031d70bcbb42
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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):