log tests/test-merge-default @ 9761:647f8c857810

age author description
Fri, 19 Jun 2009 13:58:48 +0200 Dirkjan Ochtman merge: rename -S/--show option to -P/--preview
Thu, 14 May 2009 16:03:17 +0200 Dirkjan Ochtman merge: add -S/--show option to review revisions without merging
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.