##// 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.
Mads Kiilerich -
r18256:d084df89 default
Show More
Name Size Modified Last Commit Author
/ mercurial / help
config.txt Loading ...
dates.txt Loading ...
diffs.txt Loading ...
environment.txt Loading ...
extensions.txt Loading ...
filesets.txt Loading ...
glossary.txt Loading ...
hgignore.txt Loading ...
hgweb.txt Loading ...
merge-tools.txt Loading ...
multirevs.txt Loading ...
patterns.txt Loading ...
phases.txt Loading ...
revisions.txt Loading ...
revsets.txt Loading ...
subrepos.txt Loading ...
templates.txt Loading ...
urls.txt Loading ...