Mercurial
Mercurial
>
hg
/ file revisions
summary
|
shortlog
|
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
file
| revisions |
annotate
|
diff
|
comparison
|
rss
|
help
(0)
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
tests/test-merge-default
Mon, 08 Mar 2010 03:07:35 +0100
Mads Kiilerich
test-merge-default and check-code.py: No "export x=x" in sh
stable
file
|
diff
|
annotate
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
Fri, 19 Jun 2009 13:58:48 +0200
Dirkjan Ochtman
merge: rename -S/--show option to -P/--preview
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
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
less
more
(0)
tip