tests/test-issue619
author Christoph Spiel <cspiel@freenet.de>
Thu, 27 Sep 2007 23:58:54 -0500
changeset 5364 5737845fd974
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
bdiff: simple splitlines optimization

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done