equal
deleted
inserted
replaced
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): |