Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.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 | 30146be3437c |
children | d436b21b20dc |
line wrap: on
line source
%%% should show a removed and b added A b R a reverting... %%% should show b unknown and a back to normal ? b merging a %%% should show foo-b foo-b %%% should show a removed and b added A b R a reverting... %%% should show b unknown and a marked modified (merged) ? b %%% should show foo-b foo-b