log tests/test-merge-default.out @ 3958:2b87d3c5ab8e

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