Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1812:a81f99dfaa2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the synopsis of some commands, mark rawcommit as deprecated in short help
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 28 Feb 2006 22:50:49 +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