Mercurial > hg
view tests/test-merge5.out @ 1502:1170fef58071
Fixed test-static-http with http_proxy variable set again.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 03 Nov 2005 18:59:36 +0100 |
parents | 5a034646e472 |
children | ced2d3620f95 |
line wrap: on
line source
removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to merge across branches or -C to lose changes)