##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert: better grouping of command line flags in help...
convert: better grouping of command line flags in help We normally put related command line flags after one another.
Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default
r12187:4a854122 default
Show More
test-issue619
20 lines | 203 B | text/plain | TextLexer
/ tests / test-issue619
History | Annotation | Raw |Copy content |Copy permalink
#!/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