log tests/test-merge-default.out @ 4182:01c4ea5e788c

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