tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 01 May 2006 19:17:34 +0200
changeset 2174 3044a3fdae76
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
If default sorting is name, offer name-descending with one click. Additionally no longer ignore case when sorting by name to match default sorting. This makes e.g. a repository "FOO" being listed before "bar".

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