Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1643:747c8d03bd29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bash_completion: ignore hg help error messages They are usually not useful when you're completing stuff and end up cluttering the screen.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 27 Jan 2006 12:15:39 +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