log tests/test-conflict.out @ 374:f07d00fcd281

age author description
Wed, 15 Jun 2005 21:12:28 -0800 mpm update tests to reflect new short hash length