##// END OF EJS Templates
merge: never do premerge on symlinks...
merge: never do premerge on symlinks Simplemerge is not symlink aware and will never do the right thing on symlinks.

File last commit:

r10838:07dbafd3 stable
r18257:a35d0128 default
Show More
test-status-inprocess.py.out
5 lines | 62 B | text/plain | TextLexer
/ tests / test-status-inprocess.py.out
% creating repo
% add and commit
C test.py
% change
M test.py