tests/test-confused-revert.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 26 Jan 2006 14:52:26 +0100
changeset 1638 1c75487badd6
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
bash_completion: small updates and fixes - $result in _hg_commands is not an array - use "hg status ." - update "hg cat" completion - let bash itself generate the default completion

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