tests/test-confused-revert.out
author Matt Mackall <mpm@selenic.com>
Fri, 21 Apr 2006 16:30:49 -0500
changeset 2111 2f3e644decd7
parent 2043 968f036f93a4
child 2175 b2ae81a7df29
permissions -rw-r--r--
Merge with crew

%%% 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