log tests/test-merge-default @ 3231:7a3edd3f7c3e

age author description
Tue, 15 Aug 2006 11:38:07 -0700 Vadim Gelfer merge with other head by default, not tip.