view tests/test-issue619 @ 12187:4a854122a1c7

convert: better grouping of command line flags in help We normally put related command line flags after one another.
author Martin Geisler <mg@lazybytes.net>
date Fri, 10 Sep 2010 00:07:38 +0200
parents 4c94b6d0fb1c
children
line wrap: on
line source

#!/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