tests/test-confused-revert.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 03 May 2006 14:35:17 -0700
changeset 2191 c2e43535d4d1
parent 2175 b2ae81a7df29
child 2214 6c6c0e5595a2
permissions -rw-r--r--
make templater bit more flexible and efficient for external users.

%%% 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
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
%%% 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