diff tests/test-merge4.out @ 1927:397b62d5dd13

add http_proxy= lines to test-bad-pull and test-pull
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 16:11:17 +0100
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line diff