Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1795:36e19e3da12d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix 'hg serve' not using CSS. hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]
author Lee Cantey <lcantey@gmail.com>
date Thu, 23 Feb 2006 12:02: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