mercurial/simplemerge.py

--- a/mercurial/simplemerge.py	Mon Oct 24 13:54:59 2011 +0200
+++ b/mercurial/simplemerge.py	Mon Oct 24 13:51:24 2011 +0200
@@ -430,7 +430,7 @@
     except util.Abort:
         return 1
 
-    local = os.path.realpath(local)
+    local = util.realpath(local)
     if not opts.get('print'):
         opener = scmutil.opener(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)