tests/test-conflict
author Bryan O'Sullivan <bos@serpentine.com>
Sun, 14 Aug 2005 21:33:09 -0800
changeset 907 652507dc9fce
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
Modify init command to take an optional directory to set up. If the directory does not exist, it is created. If no directory is given, the current directory is used.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status