tests/test-conflict
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 11 Apr 2008 22:19:52 -0700
changeset 6526 cfeeac24fc1e
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
repo: add rjoin method

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