view tests/test-conflict @ 7138:0df098871e3d

test-permission: put sane permissions at the end of the test

If we don't do that, we won't delete all directories at the end of the test

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status