tests/test-confused-revert.out
author Will <will@glozer.net>
Wed, 16 Nov 2005 20:53:16 +0100
changeset 1548 18f3224da392
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
fix bug in setup.py introduced in r1508. The 'console' argument is expected to be a list of strings, but was changed to just a string.

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