tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 25 Jun 2007 11:29:17 -0700
changeset 4714 a741293793f6
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Make changeset_printer respect ui diffopts

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