Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 1675:03191e1a4230
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 01 Feb 2006 08:50:45 +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