Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-revert.out @ 1883:b98160cfb2f3
give more info to hgmerge script.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 10 Mar 2006 23:34:02 -0800 |
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