log tests/test-merge1.out @ 1187:120aa5fc7ced

age author description
Tue, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick