--- a/hgext/convert/cvsps.py	Fri Aug 15 04:37:46 2014 +0200
+++ b/hgext/convert/cvsps.py	Fri Aug 15 04:37:45 2014 +0200
@@ -8,7 +8,6 @@
 import os
 import re
 import cPickle as pickle
-from mercurial import util
 from mercurial.i18n import _
 from mercurial import hook
 from mercurial import util

--- a/hgext/extdiff.py	Fri Aug 15 04:37:46 2014 +0200
+++ b/hgext/extdiff.py	Fri Aug 15 04:37:45 2014 +0200
@@ -63,7 +63,7 @@
 
 from mercurial.i18n import _
 from mercurial.node import short, nullid
-from mercurial import cmdutil, scmutil, scmutil, util, commands, encoding
+from mercurial import cmdutil, scmutil, util, commands, encoding
 import os, shlex, shutil, tempfile, re
 
 cmdtable = {}

--- a/hgext/shelve.py	Fri Aug 15 04:37:46 2014 +0200
+++ b/hgext/shelve.py	Fri Aug 15 04:37:45 2014 +0200
@@ -25,7 +25,7 @@
 from mercurial.node import nullid, nullrev, bin, hex
 from mercurial import changegroup, cmdutil, scmutil, phases, commands
 from mercurial import error, hg, mdiff, merge, patch, repair, util
-from mercurial import templatefilters, changegroup, exchange
+from mercurial import templatefilters, exchange
 from mercurial import lock as lockmod
 from hgext import rebase
 import errno