tests/test-merge-default
Sun, 07 Feb 2010 00:51:59 +0100 Benoit Boissinot merge: add hints about the use of 'hg heads' to find the rev to merge
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.
less more (0) tip