log tests/test-merge2.out @ 1142:74d184a40a2e

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