log tests/test-merge-default @ 3336:e44eadc92ec4

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