Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1642:b8d792057e5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bash_completion: always use single quotes with compgen -W This avoids a bug in bash 2.05a
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 27 Jan 2006 12:11:14 +0100
parents 30146be3437c
children d436b21b20dc
line wrap: on
line source

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