##// END OF EJS Templates
tests: unify test-globalopts
tests: unify test-globalopts

File last commit:

r12156:4c94b6d0 default
r12194:9e40ea08 default
Show More
test-issue619
20 lines | 203 B | text/plain | TextLexer
#!/bin/sh
mkdir t
cd t
hg init
echo a > a
hg ci -Ama
echo b > b
hg branch b
hg ci -Amb
hg co -C 0
echo fast-forward
hg merge b
hg ci -Ammerge
echo bogus fast-forward should fail
hg merge b
echo done