Mads Kiilerich
badb17240e
test-merge-default and check-code.py: No "export x=x" in sh
2010-03-08 03:07:35 +01:00
Greg Ward
cb143d442a
merge: fix --preview to show all nodes that will be merged (issue2043).
...
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge. The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
2010-02-15 15:25:29 -05:00
Greg Ward
cc17369c25
test-merge-default: make content of test repo clearer.
...
Makes it easier to understand and modify the test.
(issue2043).
2010-02-15 15:07:21 -05:00
Benoit Boissinot
221f6cfbd6
merge: add hints about the use of 'hg heads' to find the rev to merge
2010-02-07 00:51:59 +01:00
Dirkjan Ochtman
7daf0cc9cd
merge: rename -S/--show option to -P/--preview
2009-06-19 13:58:48 +02:00
Dirkjan Ochtman
2f19dcd8ee
merge: add -S/--show option to review revisions without merging
2009-05-14 16:03:17 +02: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
