Mercurial > hg > mercurial-source
comparison tests/test-trusted.py @ 16255:ca5cc2976574 stable
merge: handle linear update to symlink correctly (issue3316)
This fixes a regression introduced by fcf66193b186. If no file-level
merge is needed, we can update flags directly, otherwise we have a
conflict to resolve in filemerge.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 13 Mar 2012 16:28:08 -0500 |
| parents | 95b0d4c1c9e1 |
| children | 681f7b9213a4 |
comparison
equal
deleted
inserted
replaced
| 16254:c7eef052c9e3 | 16255:ca5cc2976574 |
|---|