diff -r 1f0f84660dea -r 810ca383da9c mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Tue Oct 28 19:07:14 2008 +0100
+++ b/mercurial/simplemerge.py	Tue Oct 28 19:25:26 2008 +0100
@@ -432,7 +432,6 @@
     basetext = readfile(base)
     othertext = readfile(other)
 
-    orig = local
     local = os.path.realpath(local)
     if not opts.get('print'):
         opener = util.opener(os.path.dirname(local))