Mercurial > hg

diff contrib/simplemerge @ 19378:9de689d20230

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: drop unused variables and an unused import
author Simon Heimberg <simohe@besonet.ch>
date Mon, 01 Jul 2013 20:48:56 +0200
parents cba222f01056
children f18830651811
line wrap: on
line diff
--- 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