(stable) merge stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 08 Jul 2009 01:02:51 +0200
branchstable
changeset 605 894fa61f2e0b
parent 603 474063ef3f3d (current diff)
parent 604 75621fa839fb (diff)
child 606 7f928c9d56d0
(stable) merge
--- a/hgkw/keyword.py	Thu Jul 02 10:56:01 2009 +0200
+++ b/hgkw/keyword.py	Wed Jul 08 01:02:51 2009 +0200
@@ -78,7 +78,7 @@
 from mercurial import patch, localrepo, templater, templatefilters, util, match
 from mercurial.hgweb import webcommands
 from mercurial.lock import release
-from mercurial.node import nullid, hex
+from mercurial.node import nullid
 from mercurial.i18n import _
 import re, shutil, tempfile, time