Mercurial > hg

diff mercurial/lsprof.py @ 18256:d084df89d948

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a455a18bfdac
children a40d608e2a7b
line wrap: on
line diff