Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1852:fdf9cbf56ec7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix mq's usage of opener, which don't allow absolute paths now.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 07 Mar 2006 22:41:24 +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