tests/test-unrelated-pull
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Mon, 06 Feb 2006 17:32:00 -0600
changeset 1699 83e8cd97b9f9
parent 1308 2073e5a71008
child 1933 7544700fd931
permissions -rwxr-xr-x
hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

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