tests/test-confused-revert.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 17 Feb 2006 08:26:21 -0800
changeset 1736 50de0887bbcd
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
add preoutgoing and outgoing hooks. preoutgoing lets prevent pull over http or ssh. outgoing lets notify after pull.

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