| Mon, 15 Feb 2010 15:25:29 -0500 |
Greg Ward |
merge: fix --preview to show all nodes that will be merged (issue2043).
stable
|
file |
diff |
annotate
|
| Mon, 15 Feb 2010 15:07:21 -0500 |
Greg Ward |
test-merge-default: make content of test repo clearer.
stable
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Sat, 05 Sep 2009 18:56:51 +0200 |
Patrick Mezard |
merge: exclude common ancestor from --preview (issue1818)
|
file |
diff |
annotate
|
| Thu, 14 May 2009 16:03:17 +0200 |
Dirkjan Ochtman |
merge: add -S/--show option to review revisions without merging
|
file |
diff |
annotate
|
| Mon, 23 Jun 2008 15:02:52 +0200 |
Dirkjan Ochtman |
merge: only in-branch merges can be implicit
|
file |
diff |
annotate
|
| Fri, 21 Mar 2008 11:06:02 +0100 |
Dirkjan Ochtman |
warn about new heads on commit (issue842)
|
file |
diff |
annotate
|
| Sat, 25 Aug 2007 11:30:11 +0200 |
Benoit Boissinot |
improve error message for 'hg merge' when repo already at branchtip
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 11:38:07 -0700 |
Vadim Gelfer |
merge with other head by default, not tip.
|
file |
diff |
annotate
|