--- a/hgext/extdiff.py	Fri May 13 14:48:48 2011 -0500
+++ b/hgext/extdiff.py	Fri May 13 14:58:24 2011 -0500
@@ -62,7 +62,7 @@
 
 from mercurial.i18n import _
 from mercurial.node import short, nullid
-from mercurial import cmdutil, scmutil, util, commands, encoding
+from mercurial import scmutil, scmutil, util, commands, encoding
 import os, shlex, shutil, tempfile, re
 
 def snapshot(ui, repo, files, node, tmproot):
@@ -137,7 +137,7 @@
         if node1b == nullid:
             do3way = False
 
-    matcher = cmdutil.match(repo, pats, opts)
+    matcher = scmutil.match(repo, pats, opts)
     mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher)[:3])
     if do3way:
         mod_b, add_b, rem_b = map(set, repo.status(node1b, node2, matcher)[:3])