log tests/test-merge-default.out @ 4256:fe0fe0b4d73b

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