view tests/test-unrelated-pull @ 1664:4338e33c973b

Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents 2073e5a71008
children 7544700fd931
line wrap: on
line source

#!/bin/sh

mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "0 0"

cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -m "b" -u b -d "0 0"

hg pull ../a
hg heads