tests/test-merge3.out
author Peter van Dijk <peter@dataloss.nl>
Wed, 22 Feb 2006 16:11:17 +0100
changeset 1927 397b62d5dd13
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
add http_proxy= lines to test-bad-pull and test-pull

removing b
b never committed!
nothing changed