# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247007771 -7200
# Node ID 894fa61f2e0bb88d03334ed8c7458e8a1463174e
# Parent  474063ef3f3d2ca6f203a6955852b60054320a85# Parent  75621fa839fbfd1467468ff9cf85db07a38269ea
(stable) merge

diff -r 474063ef3f3d -r 894fa61f2e0b hgkw/keyword.py
--- 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