tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 13 Mar 2006 18:33:33 +0100
changeset 1939 d59fc0d4558f
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
Use timestamps without leading 0 in test-command-template for portable tests.

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