tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 16 Jan 2006 15:51:09 +0100
changeset 1622 5e9168401a68
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
fix locate broken since 63799b01985c - fix the keyword arguments for walk in commands.locate - implement 'hg locate -r <rev>' - add a test for 'hg locate'

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