Mercurial > hg

view tests/test-confused-revert.out @ 1840:d17f19d84fd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 06 Mar 2006 17:53:11 +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