Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 1743:813f9f5fe837
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 18 Feb 2006 06:50:22 +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