diff -r 33fcad3cfbbc -r 7b9bf72430ba mercurial/merge.py
--- a/mercurial/merge.py	Thu Mar 15 13:11:03 2012 -0500
+++ b/mercurial/merge.py	Thu Mar 15 13:11:42 2012 -0500
@@ -170,7 +170,7 @@
         if m and m != a: # changed from a to m
             return m
         if n and n != a: # changed from a to n
-            if (n == 'l' or a == 'l') and m1[f] != ma[f]:
+            if (n == 'l' or a == 'l') and m1.get(f) != ma.get(f):
                 # can't automatically merge symlink flag when there
                 # are file-level conflicts here, let filemerge take
                 # care of it