# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1131056539 28800
# Node ID d176c81481c805236aa414cd1e110edf825aea25
# Parent  c5c4381d898b63ff9e94df06ebd0be77aa0c03d0# Parent  1170fef58071ef90b6b241f572331da41098f76e
Merge with TAH



diff --git a/tests/test-static-http b/tests/test-static-http
--- a/tests/test-static-http
+++ b/tests/test-static-http
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-hg clone old-http://localhost:20059/ copy
+http_proxy= hg clone old-http://localhost:20059/ copy
 echo $?
 ls copy
 
@@ -36,6 +36,6 @@ http_proxy= hg clone old-http://localhos
 cd local
 hg verify
 cat bar
-hg pull
+http_proxy= hg pull
 
 kill $!