mercurial/simplemerge.py

--- a/mercurial/simplemerge.py	Fri Oct 28 15:00:21 2011 +0200
+++ b/mercurial/simplemerge.py	Sat Oct 29 11:02:23 2011 -0500
@@ -430,7 +430,7 @@
     except util.Abort:
         return 1
 
-    local = util.realpath(local)
+    local = os.path.realpath(local)
     if not opts.get('print'):
         opener = scmutil.opener(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)