##// END OF EJS Templates
Document log date ranges and mention 'hg help dates' for all commands (issue998)
Document log date ranges and mention 'hg help dates' for all commands (issue998)

File last commit:

r5242:9cd65787 default
r6163:1f733c2f default
Show More
test-merge-default
44 lines | 492 B | text/plain | TextLexer
#!/bin/sh
hg init
echo a > a
hg commit -A -ma
echo a >> a
hg commit -mb
echo a >> a
hg commit -mc
hg up 1
echo a >> a
hg commit -md
hg up 1
echo a >> a
hg commit -me
hg up 1
echo % should fail because not at a head
hg merge
hg up
echo % should fail because \> 2 heads
hg merge
echo % should succeed
hg merge 2
hg commit -mm1
echo % should succeed - 2 heads
hg merge
hg commit -mm2
echo % should fail because at tip
hg merge
hg up 0
echo % should fail because 1 head
hg merge
true