tests/test-confused-revert.out
author Alexander Schremmer <alex AT alexanderweb DOT de>
Tue, 25 Apr 2006 00:43:40 +0200
changeset 2124 27fd8b7a6c51
parent 2043 968f036f93a4
child 2175 b2ae81a7df29
permissions -rw-r--r--
Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.

%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% 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...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b