Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1635:ae61937c61c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix rcpath for hgwebdir case (sys.argv is empty)
author efiring@manini.soest.hawaii.edu
date Tue, 24 Jan 2006 13:59:11 +1300
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