diff -r f89fd07fc51d -r e75aab656f46 tests/test-simplemerge.py --- a/tests/test-simplemerge.py Thu Mar 06 22:23:26 2008 +0100 +++ b/tests/test-simplemerge.py Thu Mar 06 22:23:41 2008 +0100 @@ -14,11 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import os import unittest from unittest import TestCase -import imp -import shutil from mercurial import util, simplemerge # bzr compatible interface, for the tests