diff tests/test-commit @ 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 9e3e975258a9
children 75c2071385da
line wrap: on
line diff