--- 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