view tests/test-issue619 @ 11346:e740f36cfb4b

tests: rename test-merge3 to test-add-remove.

It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.

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