Mercurial > hg

comparison tests/test-merge-default @ 8834:6d36fc70754e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: rename -S/--show option to -P/--preview
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 19 Jun 2009 13:58:48 +0200
parents 50b6af595e0c
children a5576908b589
comparison
equal deleted inserted replaced
8833:14639c050251 8834:6d36fc70754e
29 echo % should succeed 29 echo % should succeed
30 hg merge 2 30 hg merge 2
31 hg commit -mm1 31 hg commit -mm1
32 32
33 echo % should succeed - 2 heads 33 echo % should succeed - 2 heads
34 hg merge -S 34 hg merge -P
35 hg merge 35 hg merge
36 hg commit -mm2 36 hg commit -mm2
37 37
38 echo % should fail because at tip 38 echo % should fail because at tip
39 hg merge 39 hg merge