view tests/test-cat.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 7544700fd931
children f5b00b6e426a
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1