Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.out @ 2061:5987c1eac2ce
support nested repositories.
mercurial will not recurse into a subdirectory that contains a .hg
directory. it is treated as a separate repository.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 31 Mar 2006 17:00:09 -0800 |
parents | 8d9ec30d58bc |
children | c9226bcc288d |
line wrap: on
line source
%%% should show a removed and b added A b R a reverting... saving current version of b as b.orig forgetting b undeleting a %%% should show b unknown and a back to normal ? b ? b.orig merging a %%% should show foo-b foo-b %%% should show a removed and b added A b R a ? b.orig reverting... forgetting b undeleting a %%% should show b unknown and a marked modified (merged) ? b ? b.orig %%% should show foo-b foo-b