tests/test-confused-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 24 Mar 2006 15:03:15 +0100
changeset 1996 4c70b10f0418
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
Don't mention deprecated HGEDITOR variable in the help text of commit.

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