Mercurial > hg

view tests/test-mq-symlinks.out @ 5503:6f26c7677463

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 02 Nov 2007 14:02:28 -0700
parents f6c520fd70cf
children 49f34b43cf90
line wrap: on
line source

a -> a not a symlink
a -> b
Now at: base.patch
applying symlink.patch
Now at: symlink.patch
a -> b