view tests/test-conflict @ 7468:3e5db4228f8f

rebase: add support to keep branch names

Callback on extra fields added by Patrick Mezard <[e-mail]>.

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