# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1331754341 18000
# Node ID 7a5524f240ad9f851f067749be451f69d248b285
# Parent  ca5cc2976574d820dad5774afd8c7b3c39ec11cd
merge: accept missing revisions in symlink flag merge (issue3316)

diff -r ca5cc2976574 -r 7a5524f240ad mercurial/merge.py
--- a/mercurial/merge.py	Tue Mar 13 16:28:08 2012 -0500
+++ b/mercurial/merge.py	Wed Mar 14 14:45:41 2012 -0500
@@ -173,7 +173,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