Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 1573:28305666f4c9
File revision style fixed
author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
---|---|
date | Mon, 05 Dec 2005 04:49:37 -0500 |
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