Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 16261:7b9bf72430ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 15 Mar 2012 13:11:42 -0500
parents c655e4acaa82 7a5524f240ad
children 2b0a406d3043
line wrap: on
line diff
--- 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