view tests/test-issue1089 @ 11452:eac141407b85 stable

merge: document how to 'undo' a merge

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