Mercurial > hg
view tests/test-basic.out @ 5503:6f26c7677463
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 | 8feb33c2d153 |
children |
line wrap: on
line source
changeset: 0:0acdaf898367 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: test b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a a checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions