Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-symlinks.hg
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 02 Nov 2007 14:02:28 -0700
changeset 5503 6f26c7677463
parent 5408 36794dbe66a3
permissions -rw-r--r--
Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5408
36794dbe66a3 Test workingctx exec/link bit for copies.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
(binary:application/octet-stream)
Mercurial