tests/test-confused-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 13 Mar 2006 08:56:59 +0100
changeset 1922 6d50d6189269
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.

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