tests/test-confused-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 11 Nov 2005 15:33:08 -0800
changeset 1527 c13fce7167c2
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
don't print anything about file of unsupported type unless the file was specified on the command line

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