Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 16256:c655e4acaa82

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 Tue, 13 Mar 2012 16:29:13 -0500
parents c12d4aceba79 ca5cc2976574
children 7b9bf72430ba
comparison
equal deleted inserted replaced
16253:17f179805297 16256:c655e4acaa82
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': 173 if (n == 'l' or a == 'l') and m1[f] != ma[f]:
174 # can't automatically merge symlink flag change here, let 174 # can't automatically merge symlink flag when there
175 # filemerge take care of it 175 # are file-level conflicts here, let filemerge take
176 # care of it
176 return m 177 return m
177 return n 178 return n
178 return '' # flag was cleared 179 return '' # flag was cleared
179 180
180 def act(msg, m, f, *args): 181 def act(msg, m, f, *args):