view tests/test-conflict @ 11065:76d6c19aa8ef

keyword: cleanup test and make it portable

- replace sed call with python command
- no need to back up hgrc before record

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