log tests/test-merge-types @ 5536:fdee5d614fcc

age author description
Fri, 02 Nov 2007 14:02:28 -0700 Bryan O'Sullivan Test a merge of a symlink against an executable file.