Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 14064:e4bfb9c337f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove unused imports and variables
author Alexander Solovyov <alexander@solovyov.net>
date Sat, 30 Apr 2011 13:59:14 +0200
parents d1f4e7fd970a
children 135e244776f0
line wrap: on
line diff
--- a/mercurial/merge.py	Sat Apr 30 07:30:38 2011 -0500
+++ b/mercurial/merge.py	Sat Apr 30 13:59:14 2011 +0200
@@ -271,7 +271,6 @@
     ms.reset(wctx.p1().node())
     moves = []
     action.sort(key=actionkey)
-    substate = wctx.substate # prime
 
     # prescan for merges
     u = repo.ui