##// END OF EJS Templates
pull: with -u and -r, update to the first revision given...
r10358:d42821cd default
Show More
test-conflict
15 lines | 244 B | text/plain | TextLexer
#!/bin/sh
hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status