tests/test-conflict
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 31 Mar 2006 17:00:09 -0800
changeset 2061 5987c1eac2ce
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
support nested repositories. mercurial will not recurse into a subdirectory that contains a .hg directory. it is treated as a separate repository.

#!/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"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
egrep -v ">>>|<<<" a
hg status