##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-manifest: test symlink and exec bit display
test-manifest: test symlink and exec bit display
Patrick Mezard - - Load All Authors

File last commit:

r5391:786c1206 default
r5406:f11554a0 default
Show More
test-merge-symlinks.out
9 lines | 266 B | text/plain | TextLexer
/ tests / test-merge-symlinks.out
History | Annotation | Raw |Copy content |Copy permalink
% create heads
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% merge heads
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)