log tests/test-merge-default.out @ 4646:196d90bf5c15

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