view tests/test-conflict @ 9122:a9eae2f3241c

url: fix use of non-int port in https connections via proxy

Complements eef406165507 (issue1725).

#!/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"
hg merge 1
hg id
cat a
hg status