Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
16260:33fcad3cfbbc 16261:7b9bf72430ba
168 return "l" # Symlink 168 return "l" # Symlink
169 return "" 169 return ""
170 if m and m != a: # changed from a to m 170 if m and m != a: # changed from a to m
171 return m 171 return m
172 if n and n != a: # changed from a to n 172 if n and n != a: # changed from a to n
173 if (n == 'l' or a == 'l') and m1[f] != ma[f]: 173 if (n == 'l' or a == 'l') and m1.get(f) != ma.get(f):
174 # can't automatically merge symlink flag when there 174 # can't automatically merge symlink flag when there
175 # are file-level conflicts here, let filemerge take 175 # are file-level conflicts here, let filemerge take
176 # care of it 176 # care of it
177 return m 177 return m
178 return n 178 return n