log tests/test-merge-default.out @ 6202:0ab0da2215d7

age author description
Sat, 25 Aug 2007 11:30:11 +0200 Benoit Boissinot improve error message for 'hg merge' when repo already at branchtip
Tue, 15 Aug 2006 11:38:07 -0700 Vadim Gelfer merge with other head by default, not tip.