Mercurial > hg

log tests/test-merge-default.out @ 8784:9154c79c67cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Thu, 14 May 2009 16:03:17 +0200 Dirkjan Ochtman merge: add -S/--show option to review revisions without merging
Mon, 23 Jun 2008 15:02:52 +0200 Dirkjan Ochtman merge: only in-branch merges can be implicit
Fri, 21 Mar 2008 11:06:02 +0100 Dirkjan Ochtman warn about new heads on commit (issue842)
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