Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 1456:214f42f23a3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove copy/rename --parents option This is no longer needed now that we have more standard UNIX-like copy semantics.
author Matt Mackall <mpm@selenic.com>
date Wed, 26 Oct 2005 16:32:50 -0700
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