Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 1932:82995896d5af
Merge with http://hg.home.dataloss.nl/hg-portabletests
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 13 Mar 2006 12:22:55 +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