tests/test-confused-revert.out
author Lee Cantey <lcantey@gmail.com>
Fri, 24 Mar 2006 08:27:24 +0100
changeset 1992 ea8345a7a29d
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
Include templates/static/* in MANIFEST.in so that distutils setup will include them.

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