Mercurial > hg > gitweb

view tests/test-confused-revert.out @ 2105:21cf3fe64e27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with cmason
author Matt Mackall <mpm@selenic.com>
date Thu, 20 Apr 2006 12:12:03 -0500
parents 968f036f93a4
children b2ae81a7df29
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% 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...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b