5 Commits

Author	SHA1	Message	Date
Dirkjan Ochtman	2f19dcd8ee	merge: add -S/--show option to review revisions without merging	2009-05-14 16:03:17 +02:00
Dirkjan Ochtman	bf8b01e844	merge: only in-branch merges can be implicit	2008-06-23 15:02:52 +02:00
Dirkjan Ochtman	3e3b0d62eb	warn about new heads on commit (issue842)	2008-03-21 11:06:02 +01:00
Benoit Boissinot	513ea49cfc	improve error message for 'hg merge' when repo already at branchtip	2007-08-25 11:30:11 +02:00
Vadim Gelfer	efefb2e2cb	merge with other head by default, not tip. ... fixes issue 339.	2006-08-15 11:38:07 -07:00