tests/test-conflict
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 14 May 2006 17:37:17 -0700
changeset 2281 7761597b5da3
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
prompt user for http authentication info in interactive mode, mercurial now asks the user for the username and password when the server requires it. the previous behavior was to fail with an http 401. based on patch from eric jaffe <jaffe.eric@gmail.com>.

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