--- a/contrib/simplemerge	Mon Jul 01 20:48:55 2013 +0200
+++ b/contrib/simplemerge	Mon Jul 01 20:48:56 2013 +0200
@@ -3,7 +3,7 @@
 from mercurial import demandimport
 demandimport.enable()
 
-import os, sys
+import sys
 from mercurial.i18n import _
 from mercurial import simplemerge, fancyopts, util, ui