##// END OF EJS Templates
merge: make internal merge fail cleanly on symlinks...
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.

File last commit:

r15168:cfccd3be default
r18256:d084df89 default
Show More
CONTRIBUTORS
4 lines | 172 B | text/plain | TextLexer
various
hgext: add largefiles extension...
r15168 Greg Ward, author of the original bfiles extension
Na'Tosha Bard of Unity Technologies
Fog Creek Software
Special thanks to the University of Toronto and the UCOSP program