log tests/test-merge-default.out @ 4883:2a01e03ffacd

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