view tests/test-issue1089 @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

#!/bin/sh

hg init a
cd a
mkdir a
echo a > a/b
hg ci -Am m
hg rm a
hg ci -m m a

mkdir a b
echo a > a/b
hg ci -Am m
hg rm a
cd b
# relative delete
hg ci -m m ../a