view tests/test-merge3 @ 10154:d4a62b6d4a58 stable

run-tests.py: clears http_proxy for all tests

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"