Mercurial > hg

diff mercurial/merge.py @ 16257:7a5524f240ad stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: accept missing revisions in symlink flag merge (issue3316)
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2012 14:45:41 -0500
parents ca5cc2976574
children 7b9bf72430ba
line wrap: on
line diff
--- 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