tests/test-confused-revert.out
author TK Soh <teekaysoh@yahoo.com>
Tue, 07 Mar 2006 08:05:17 +0100
changeset 1848 bb70ffebe77b
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
show choices on ambiguous commands

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