Mercurial > hg
comparison tests/test-hgweb-filelog.t @ 18256:d084df89d948
merge: make internal merge fail cleanly on symlinks
Simplemerge is not symlink aware and will never do the the right thing on
symlinks. It would read the symlink as a file and abort with 'No such file or
directory' on dangling symlinks.
Instead, internal:merge now simply fails to merge symlinks.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 08 Jan 2013 04:15:41 +0100 |
| parents | b31266671918 |
| children | d6ebdbdd70a5 |
comparison
equal
deleted
inserted
replaced
| 18255:7ca534f31a83 | 18256:d084df89d948 |
|---|