Mercurial > hg

view tests/test-status-inprocess.py.out @ 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 07dbafd3a0e2
children
line wrap: on
line source

% creating repo
% add and commit
C test.py
% change
M test.py