Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1552:7509fa02437f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added version information to "report bug" message for unknown exceptions.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 16 Nov 2005 19:19: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