Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 2006:ff8b39daa930

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show reason why an ignore file can't be read and state that it is skipped.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 25 Mar 2006 10:31:06 +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