tests/test-conflict
author mpm@selenic.com
Thu, 22 Sep 2005 09:47:03 -0700
changeset 1314 d37a46859acd
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
Fix default clone destination The default clone wasn't working: $ hg clone hg abort: repository hg/.hg not found! This was because we were creating the destination directory from the default, then checking whether it existed to determine whether to expand the path.

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