Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-revert.out @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Dec 2005 22:19:03 -0600 |
parents | 2bc6cd62a29c |
children | d436b21b20dc |
line wrap: on
line source
%% should show b unknown ? b %% should show b unknown and c modified M c ? b %% should show b added and c modified M c A b %% should show a removed, b added and c modified M c A b R a %% should show b added and c modified M c A b %% should show b unknown and c modified M c ? b %% should show b unknown ? b %% should show a b and c a b c