Mercurial > hg
view tests/test-confused-revert.out @ 2038:5c4496ed152d
Tell the user the real "hg update -C" command, not just "-C" when aborting.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 02 Apr 2006 18:16:06 +0200 |
parents | c9226bcc288d |
children | a514c7509fa9 |
line wrap: on
line source
%%% should show a removed and b added A b R a reverting... 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