Mercurial > hg > pyhgsh
view tests/test-confused-revert.out @ 1766:93f54a2b3864
tags-rss support; still shows tip
author | Peter van Dijk <peter@dataloss.nl> |
---|---|
date | Thu, 02 Feb 2006 12:00: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