Mercurial > hg
comparison tests/test-conflict.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 | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
| 1926:ba198d17eea9 | 1927:397b62d5dd13 |
|---|