tests/test-mq-qsave.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 02 Nov 2007 14:02:28 -0700
changeset 5503 6f26c7677463
parent 2817 ff3edd1c1e27
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.

adding base
restoring status: hg patches saved state