view tests/test-conflict @ 10969:ca052b484e56

context: remove parents parameter to workingctx

it was needed before the refactor of commit, workingctx always uses the
dirstate now.

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