tests/test-resolve.t

--- a/tests/test-resolve.t	Sat May 13 17:53:55 2017 +0900
+++ b/tests/test-resolve.t	Sat Jan 09 23:07:20 2016 +0900
@@ -85,9 +85,9 @@
 
   $ cat > $TESTTMP/markdriver.py << EOF
   > '''mark and unmark files as driver-resolved'''
-  > from mercurial import cmdutil, merge, scmutil
+  > from mercurial import merge, registrar, scmutil
   > cmdtable = {}
-  > command = cmdutil.command(cmdtable)
+  > command = registrar.command(cmdtable)
   > @command('markdriver',
   >   [('u', 'unmark', None, '')],
   >   'FILE...')