Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 1773:aae93c3bffb4
hgmerge: improve "apps not found" message
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Tue, 21 Feb 2006 15:48:19 -0600 |
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